diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-07-01 22:48:41 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-07-01 22:48:41 +0000 |
| commit | 6c47cfb1f9060010f599c14ceaea0affcd55b4c7 (patch) | |
| tree | 02adc6539ae31edc52bee83f520fa41941720202 | |
| parent | 4f49abf36a06fc40b7e95772f12e7b1f9d053c07 (diff) | |
| download | ATCD-6c47cfb1f9060010f599c14ceaea0affcd55b4c7.tar.gz | |
*** empty log message ***
306 files changed, 0 insertions, 28519 deletions
diff --git a/TAO/CIAO/DnC/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Any_Handler.cpp deleted file mode 100644 index 49ba1e531d1..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Any_Handler.cpp +++ /dev/null @@ -1,230 +0,0 @@ -//$Id$ - -#include "Any_Handler.h" -#include "DT_Handler.h" -#include "tao/Exception.h" -#include "Utils.h" - -void -CIAO::Config_Handler::Any_Handler::validate_ValueNode (DOMNodeIterator * iter, - const char * name) -{ - DOMNode * node = iter->nextNode (); - XStr temp_name (node->getNodeName ()); - if (temp_name != XStr (ACE_TEXT (name))) - { - ACE_DEBUG ((LM_DEBUG, "CIAO::Config_Handler::Any_Handler::validate\ - valueNode (), element mismatch expected \ - <%s> \n", name)); - ACE_THROW (CORBA::INTERNAL ()); - } -} - -void -CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter, - ::CORBA::Any &any_obj) -{ - // Process the name value definitions within the Any - DOMNode * node = iter->nextNode (); - - // Get name of the current element - XStr name (node->getNodeName ()); - - // Initialize the ORB so that CORBA::Any will work - int argc = 0; - char ** argv = 0; - CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, ""); - - if (name == XStr (ACE_TEXT ("type"))) - { - // Process DataType - ::CORBA::TypeCode_var type; - DT_Handler::process_DataType (iter, type.out (), orb); - - //Switch on the type of the BasicType - switch (type->kind ()) - { - case CORBA::tk_short: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "short"); - // Process the short value - any_obj <<= ACE_static_cast(CORBA::Short, - Utils::parse_long (iter)); - break; - - case CORBA::tk_ushort: - - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "ushort"); - // Process the ushort value - any_obj <<= ACE_static_cast (CORBA::UShort, - Utils::parse_ulong (iter)); - break; - - case CORBA::tk_long: - - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <long> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "long"); - // Process the long value - any_obj <<= ACE_static_cast (CORBA::Long, - Utils::parse_long (iter)); - break; - - case CORBA::tk_ulong: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <ulong> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "ulong"); - // Process the ulong value - any_obj <<= ACE_static_cast (CORBA::ULong, - Utils::parse_long (iter)); - break; - - case CORBA::tk_float: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <float> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "float"); - // Process the float value - any_obj <<= ACE_static_cast (CORBA::Float, - Utils::parse_float (iter)); - break; - - case CORBA::tk_double: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "double"); - // Process the double value - any_obj <<= ACE_static_cast (CORBA::Double, - Utils::parse_double (iter)); - break; - - case CORBA::tk_boolean: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "bool"); - // Process the bool value - any_obj <<= CORBA::Any::from_boolean (Utils::parse_bool (iter)); - break; - - case CORBA::tk_char: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "char"); - // Process the char value - any_obj <<= CORBA::Any::from_char (Utils::parse_char (iter)); - break; - - case CORBA::tk_octet: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "octet"); - // Process the octet value - any_obj <<= CORBA::Any::from_octet (Utils::parse_octet (iter)); - break; - - case CORBA::tk_string: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "string"); - // Process the string value - { - char * temp = Utils::parse_string (iter); - any_obj <<= temp; - XMLString::release (&temp); - } - break; - - case CORBA::tk_longlong: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "longlong"); - // Process the longlong value - any_obj <<= ACE_static_cast (CORBA::LongLong, - Utils::parse_long (iter)); - break; - - case CORBA::tk_ulonglong: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "ulonglong"); - // Process the longlong value - any_obj <<= ACE_static_cast (CORBA::ULongLong, - Utils::parse_ulong (iter)); - break; - - case CORBA::tk_longdouble: - // Check if next node is a <value> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "value"); - // Check if the next node is a <short> node - CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter, - "longdouble"); - // Process the longlong value -- Create a scope to define the - // lifetime for the ret_val object created within the case statement. - { -#if ACE_SIZEOF_LONG_DOUBLE == 16 - CORBA::LongDouble ret_str = Utils::parse_double (iter); -#else - CORBA::LongDouble ret_str; - char * ret_val = Utils::parse_string (iter); - ACE_OS::memcpy (&ret_str.ld, ret_val, 16); - XMLString::release (&ret_val); -#endif - any_obj <<= ret_str; - } - break; - - default: - ACE_DEBUG ((LM_DEBUG, "Currently the DnC handlers support only \ - basic types, complex and recusive type \ - support will be added\n")); - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Any_Handler::process_ \ - Any element mismatch expected <type>")); - ACE_THROW (CORBA::INTERNAL ()); - } - - // Release ORB resource - CORBA::release (orb); -} diff --git a/TAO/CIAO/DnC/Config_Handlers/Any_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Any_Handler.h deleted file mode 100644 index be6dbcd591f..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Any_Handler.h +++ /dev/null @@ -1,59 +0,0 @@ -//================================================================== -/** - * @file Any_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef ANY_HANDLER_H -#define ANY_HANDLER_H -#include /**/ "ace/pre.h" - -#include "ciao/DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class Any_Handler - * - * @brief Handler class for <Deployment:Any> type - * - * This class defines handler methods to parse Implementation - * Dependency types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - class Config_Handler_Export Any_Handler - { - public: - static void process_Any (DOMNodeIterator * iter, - ::CORBA::Any &any_obj); - // process elements of type Deployment:Any in the descriptor files - - private: - static void validate_ValueNode (DOMNodeIterator * iter, - const char * name); - // validate <value> .. </value> node present in the XML schema - }; - } -} - -#include /**/ "ace/post.h" - -#endif /* ID_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Basic_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Basic_Handler.cpp deleted file mode 100644 index 205ad62a83a..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Basic_Handler.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// $Id$ - -#include "Basic_Handler.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -Basic_Handler::Basic_Handler (DOMDocument* doc, unsigned long filter) - : traverse_ (doc), - doc_ (doc), - root_ (doc->getDocumentElement()), - filter_ (filter), - iter_ (traverse_->createNodeIterator (this->root_, - this->filter_, - 0, - true)), - release_ (true), - index_ (0) -{ -} - -Basic_Handler::Basic_Handler (DOMNodeIterator* iter, bool release) - : traverse_ (0), doc_ (0), root_ (0), filter_ (0), iter_ (iter), - release_ (release) -{ -} - -Basic_Handler::Basic_Handler (DOMDocument* doc, DOMNodeIterator* iter, - bool release) - : traverse_ (0), doc_ (doc), root_ (0), filter_ (0), iter_ (iter), - release_ (release) -{ -} - -Basic_Handler::~Basic_Handler() -{ - if (this->release_) - this->iter_->release(); -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/Basic_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Basic_Handler.h deleted file mode 100644 index 6c7089915b6..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Basic_Handler.h +++ /dev/null @@ -1,93 +0,0 @@ -//================================================================== -/** - * @file Basic_Handler.h - * - * $Id$ - * - * @author Emre Turkay <emre.turkay@vanderbilt.edu> - */ -//===================================================================== - -#ifndef BASIC_HANDLER_H -#define BASIC_HANDLER_H - -#include "Deployment.h" - -#include "ace/SString.h" -#include "ace/Null_Mutex.h" -#include "ace/Hash_Map_Manager.h" -#include "Config_Handler_export.h" - -#include <xercesc/dom/DOM.hpp> - -using xercesc::DOMDocument; -using xercesc::DOMNodeIterator; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNode; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class Basic_Handler - * - * @brief The base class for all the Handler classes - * - * This class provides the functionalities common to all handler classes. - * Keeps variables for basic XML document handling, - * initialization/uninitialization, - * and required get/set methods. - */ - -class Config_Handler_Export Basic_Handler { -public: - typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP; - typedef ACE_Hash_Map_Iterator<ACE_TString, int, ACE_Null_Mutex> REF_ITER; - typedef ACE_Hash_Map_Manager<int, ACE_TString, ACE_Null_Mutex> IDREF_MAP; - - Basic_Handler (DOMDocument* doc, unsigned long filter_); - - Basic_Handler (DOMNodeIterator* iter, bool release = false); - - Basic_Handler (DOMDocument* doc, DOMNodeIterator* iter, - bool release = false); - - ~Basic_Handler (void); - - REF_MAP& id_map() - { - return this->id_map_; - } - - void set_iter (DOMNodeIterator* iter) - { - iter_ = iter; - } - - void set_doc (DOMDocument* doc) - { - doc_ = doc; - } - -protected: - DOMDocumentTraversal* traverse_; - - DOMDocument* doc_; - - DOMNode* root_; - - unsigned long filter_; - - DOMNodeIterator* iter_; - - bool release_; - - int index_; - - REF_MAP id_map_; - - IDREF_MAP idref_map_; -}; - -END_DEPLOYMENT_NAMESPACE - -#endif // BASIC_HANDLER_H diff --git a/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.cpp deleted file mode 100644 index 1f6464e6102..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.cpp +++ /dev/null @@ -1,310 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ERE_Handler.h" -#include "CEPE_Handler.h" -#include "CPR_Handler.h" -#include "CAD_Handler.h" -#include "Property_Handler.h" -#include "Requirement_Handler.h" -#include "CompPkgDesc_Handler.h" -#include "Utils.h" -#include "Process_Element.h" -#include <iostream> - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the connection resource deployment description and populate it -void CAD_Handler::process_ComponentAssemblyDescription - (::Deployment::ComponentAssemblyDescription& cad) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ComponentAssemblyDescription"))) - { - } - else if - (process_sequence_local - <Deployment::SubcomponentInstantiationDescription> - (this->doc_, this->iter_, node, - node_name, "instance", cad.instance, - this, &CAD_Handler::process_instance)); - else if - (process_sequence_local<Deployment::AssemblyConnectionDescription> - (this->doc_, this->iter_, node, - node_name, "connection", cad.connection, - this, &CAD_Handler::process_connection)); - else if - (process_sequence_local<Deployment::AssemblyPropertyMapping> - (this->doc_, this->iter_, node, - node_name, "externalProperty", cad.externalProperty, - this, &CAD_Handler::process_property)); - else - { - this->iter_->previousNode (); - return; - } - } - - this->update_spe_refs (cad); - this->update_spr_refs (cad); - - return; -} - -void CAD_Handler::update_spe_refs (Deployment:: - ComponentAssemblyDescription& cad) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int value; - ACE_TString ref_name; - - for (x = 0; x < cad.connection.length (); ++x) - { - for (y = 0; y < cad.connection[x].internalEndpoint.length (); ++y) - { - ref_value = cad.connection[x].internalEndpoint[y].instanceRef; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, value) == 0) - { - cad.connection[x].internalEndpoint[y].instanceRef= value; - } - } - } - } -} - -void CAD_Handler::update_spr_refs (Deployment:: - ComponentAssemblyDescription& cad) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int value; - ACE_TString ref_name; - - for (x = 0; x < cad.externalProperty.length (); ++x) - { - for (y = 0; y < cad.externalProperty[x].delegatesTo.length (); ++y) - { - ref_value = cad.externalProperty[x].delegatesTo[y].instanceRef; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, value) == 0) - { - cad.externalProperty[x].delegatesTo[y].instanceRef = value; - } - } - } - } -} - -void CAD_Handler::process_instance (DOMNodeIterator* iter, - Deployment:: - SubcomponentInstantiationDescription& sid) -{ - char* root_node_name_ch = XMLString::transcode - (this->doc_->getDocumentElement ()->getNodeName ()); - ACE_TString root_node_name (root_node_name_ch); - - XMLString::release (&root_node_name_ch); - - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:SubcomponentInstantiationDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", sid.name)); - else if - (process_sequence_remote<Deployment::ComponentPackageDescription, - CompPkgDesc_Handler> - (this->doc_, this->iter_, node, - node_name, "package", sid.package, - &CompPkgDesc_Handler::process_ComponentPackageDescription, - this->id_map_)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "configProperty", sid.configProperty, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_common<Deployment::Requirement> - (this->doc_, this->iter_, node, - node_name, "selectRequirement", sid.selectRequirement, - &Requirement_Handler::process_Requirement, - this->id_map_)); - else if - (process_sequence_remote<Deployment::ComponentPackageReference, - CPR_Handler> - (this->doc_, this->iter_, node, - node_name, "reference", sid.reference, - &CPR_Handler::process_ComponentPackageReference, this->id_map_)); - else - { - iter->previousNode(); - return; - } - } -} - -void CAD_Handler::process_connection (DOMNodeIterator* iter, - Deployment:: - AssemblyConnectionDescription& acd) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:AssemblyConnectionDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", acd.name)); - else if - (process_sequence_common<Deployment::Requirement> - (node->getOwnerDocument(), iter, node, - node_name, "deployRequirement", acd.deployRequirement, - &Requirement_Handler::process_Requirement, - this->id_map_)); - else if - (process_sequence_common<Deployment::ComponentExternalPortEndpoint> - (node->getOwnerDocument(), iter, node, - node_name, "externalEndpoint", acd.externalEndpoint, - &CEPE_Handler::process_ComponentExternalPortEndpoint, - this->id_map_)); - else if - (process_sequence_local<Deployment::SubcomponentPortEndpoint> - (node->getOwnerDocument(), iter, node, - node_name, "internalEndpoint", acd.internalEndpoint, - this, &CAD_Handler::process_spe)); - else if - (process_sequence_common<Deployment::ExternalReferenceEndpoint> - (node->getOwnerDocument(), iter, node, - node_name, "externalReference", acd.externalReference, - &ERE_Handler::process_ExternalReferenceEndpoint, - this->id_map_)); - else - { - iter->previousNode(); - return; - } - } -} - -void CAD_Handler::process_spe (DOMNodeIterator* iter, - Deployment::SubcomponentPortEndpoint& spe) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:SubcomponentPortEndpoint"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "portName", spe.portName)); - else if - (process_reference(node, node_name, "instance", - spe.instanceRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else - { - iter->previousNode(); - return; - } - } -} - -void CAD_Handler::process_spr (DOMNodeIterator* iter, - Deployment::SubcomponentPropertyReference& spr) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:SubcomponentPropertyReference"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "propertyName", spr.propertyName)); - else if - (process_reference(node, node_name, "instance", - spr.instanceRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else - { - iter->previousNode(); - return; - } - } -} - -void CAD_Handler::process_property(DOMNodeIterator* iter, - Deployment::AssemblyPropertyMapping& apm) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:AssemblyPropertyMapping"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", apm.name)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "externalName", apm.externalName)); - else if - (process_sequence_local<Deployment::SubcomponentPropertyReference> - (node->getOwnerDocument(), iter, node, - node_name, "delegatesTo", apm.delegatesTo, - this, &CAD_Handler::process_spr)); - else - { - iter->previousNode(); - return; - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.h b/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.h deleted file mode 100644 index 1e867628279..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.h +++ /dev/null @@ -1,130 +0,0 @@ -//================================================================== -/** - * @file CAD_Handler.h - * - * $Id$ - * - * @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu> - */ -//===================================================================== -#ifndef CAD_HANDLER_H -#define CAD_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" - -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class CAD_Handler - * - * @brief Handler class for <ComponentAssemblyDescription> type - * - * This class is within the Component Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the descriptor files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export CAD_Handler: public Basic_Handler -{ -public: - - /// constructor - CAD_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - CAD_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - CAD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the component assembly description - void process_ComponentAssemblyDescription (::Deployment::ComponentAssemblyDescription &cad); - - /// process instance - void process_instance (DOMNodeIterator* iter, - Deployment::SubcomponentInstantiationDescription& sid); - - /// process connection element - void process_connection (DOMNodeIterator* iter, - Deployment::AssemblyConnectionDescription& acd); - - /// process property element - void process_property (DOMNodeIterator* iter, - Deployment::AssemblyPropertyMapping& acd); - - /// process spe element - void process_spe (DOMNodeIterator* iter, - Deployment::SubcomponentPortEndpoint& spe); - - /// process spr element - void process_spr (DOMNodeIterator* iter, - Deployment::SubcomponentPropertyReference& spr); - - /// process CPD - void process_package (DOMNodeIterator* iter, - Deployment::ComponentPackageDescription& sid_package); - - /// update spe refs - void update_spe_refs (Deployment::ComponentAssemblyDescription& cad); - - /// update spr refs - void update_spr_refs (Deployment::ComponentAssemblyDescription& cad); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* CAD_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CEPE_Handler.cpp deleted file mode 100644 index 27152ba8c1d..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CEPE_Handler.cpp +++ /dev/null @@ -1,30 +0,0 @@ -//$Id$ - -#include "CEPE_Handler.h" -#include "tao/Exception.h" -#include "Utils.h" - -using CIAO::Config_Handler::Utils; - -void -CIAO::Config_Handler::CEPE_Handler:: -process_ComponentExternalPortEndpoint (DOMNodeIterator * iter, - Deployment::ComponentExternalPortEndpoint - &ret_struct) -{ - //Check if the Schema IDs for both the elements match - DOMNode * node = iter->nextNode (); - XStr name (node->getNodeName ()); - - if (name != XStr (ACE_TEXT ("portName"))) - { - ACE_DEBUG ((LM_DEBUG, - "Config_Handlers:: \ - CEPE_Handler::process_ComponentExtPortEndPoint \ - element mismatch expected <portName>")); - ACE_THROW (CORBA::INTERNAL ()); - } - - // Populate the structure - ret_struct.portName = Utils::parse_string (iter); -} diff --git a/TAO/CIAO/DnC/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/DnC/Config_Handlers/CEPE_Handler.h deleted file mode 100644 index 3d1fb12b00b..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CEPE_Handler.h +++ /dev/null @@ -1,62 +0,0 @@ -//================================================================== -/** - * @file CEPE_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== -#ifndef CEPE_HANDLER_H -#define CEPE_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class ID_Handler - * - * @brief Handler class for <ComponentExternalPortEndpoint> type - * - * This class defines handler methods to parse the aforementioned type - * in the descriptor files. The corresponding CORBA IDL type for this - * element is returned. - */ - - class Config_Handler_Export CEPE_Handler - { - public: - static void - process_ComponentExternalPortEndpoint (DOMNodeIterator * iter, - Deployment::ComponentExternalPortEndpoint &ret_struct); - // process <ComponentExternalPortEndPoint> definitions in the descriptor - // files - - }; - } - -} - -#include /**/ "ace/post.h" - -#endif /* CEPE_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.cpp deleted file mode 100644 index d2fee81d7ce..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.cpp +++ /dev/null @@ -1,75 +0,0 @@ -//$Id$ - -#include "CPK_Handler.h" -#include "tao/Exception.h" -#include "Utils.h" - -using CIAO::Config_Handler::Utils; - -void -CIAO::Config_Handler::CPK_Handler:: -process_CCMComponentPortKind (DOMNodeIterator * iter, - Deployment::CCMComponentPortKind &kind) -{ - char* facet = XMLString::transcode (XStr ("Facet")); - char* simplex_receptacle = XMLString::transcode (XStr ("SimplexReceptacle")); - char* multiplex_receptacle = XMLString::transcode - (XStr ("MultiplexReceptacle")); - char* event_emitter = XMLString::transcode (XStr ("EventEmitter")); - char* event_publisher = XMLString::transcode (XStr ("EventPublisher")); - char* event_consumer = XMLString::transcode (XStr ("EventConsumer")); - char * temp = Utils::parse_string (iter); - XStr kind_str = XStr (temp); - XMLString::release (&temp); - - char* kind_str_tr = XMLString::transcode (kind_str); - - if ((ACE_OS::strcmp (kind_str_tr, facet)) == 0) - { - kind = Deployment::Facet; - } - else if ((ACE_OS::strcmp (kind_str_tr, simplex_receptacle)) == 0) - { - kind = Deployment::SimplexReceptacle; - } - else if ((ACE_OS::strcmp (kind_str_tr, multiplex_receptacle)) == 0) - { - kind = Deployment::MultiplexReceptacle; - } - else if ((ACE_OS::strcmp (kind_str_tr, event_emitter)) == 0) - { - kind = Deployment::EventEmitter; - } - else if ((ACE_OS::strcmp (kind_str_tr, event_publisher)) == 0) - { - kind = Deployment::EventPublisher; - } - else if ((ACE_OS::strcmp (kind_str_tr, event_consumer)) == 0) - { - kind = Deployment::EventConsumer; - } - else - { - // Something wrong here.. Throw exception - XMLString::release (&kind_str_tr); - XMLString::release (&facet); - XMLString::release (&simplex_receptacle); - XMLString::release (&multiplex_receptacle); - XMLString::release (&event_emitter); - XMLString::release (&event_publisher); - XMLString::release (&event_consumer); - - ACE_DEBUG ((LM_DEBUG, - "Config_Handler::CPK_Handler::process_CCMComponentPortKing \ - illegal <CCMComponentPortKind> value found \n")); - ACE_THROW (CORBA::INTERNAL ()); - } - - XMLString::release (&kind_str_tr); - XMLString::release (&facet); - XMLString::release (&simplex_receptacle); - XMLString::release (&multiplex_receptacle); - XMLString::release (&event_emitter); - XMLString::release (&event_publisher); - XMLString::release (&event_consumer); -} diff --git a/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.h b/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.h deleted file mode 100644 index 2eaa7b6a216..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.h +++ /dev/null @@ -1,57 +0,0 @@ -//================================================================== -/** - * @file CPK_Handler.h - * - * $Id$ - * - * @author Emre Turkay <emre.turkay@vanderbilt.edu> - */ -//===================================================================== - -#ifndef CPK_HANDLER_H -#define CPK_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class CPK_Handler - * - * @brief Handler class for <CCMComponentPortKind> type - * - * This class defines handler methods to parse Implementation - * Dependency types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - class Config_Handler_Export CPK_Handler - { - public: - static void process_CCMComponentPortKind (DOMNodeIterator * iter, - Deployment::CCMComponentPortKind &kind); - // process elements of type CCMComponentPortKind definitions in - // the descriptor files - - }; - } - -} - -#include /**/ "ace/post.h" - -#endif /* CPK_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp deleted file mode 100644 index 424e6246e28..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "CPR_Handler.h" -#include "Utils.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the connection resource deployment description and populate it -void CPR_Handler::process_ComponentPackageReference -(::Deployment::ComponentPackageReference &cpr) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - - if (false); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "requiredUUID", - cpr.requiredUUID)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "requiredName", cpr.requiredName)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "requiredType", cpr.requiredType)); - else - { - this->iter_->previousNode (); - return; - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.h b/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.h deleted file mode 100644 index 4d56f71a3ca..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.h +++ /dev/null @@ -1,87 +0,0 @@ -//================================================================== -/** - * @file CPR_Handler.h - * - * $Id$ - * - * @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu> - */ -//===================================================================== -#ifndef CPR_HANDLER_H -#define CPR_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -#include "Basic_Handler.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class CPR_Handler - * - * @brief Handler class for <ComponentPackageReference> type - * - * This class is within the Execution Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the descriptor files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export CPR_Handler: public Basic_Handler -{ -public: - - /// constructor - CPR_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - CPR_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - CPR_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the component package reference - void process_ComponentPackageReference (::Deployment::ComponentPackageReference &cpr); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* CPR_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.cpp deleted file mode 100644 index d357bc03ec8..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.cpp +++ /dev/null @@ -1,57 +0,0 @@ -//================================================================== -/** - * @file Cap_Handler.cpp - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//================================================================== - -#include "Cap_Handler.h" -#include "SP_Handler.h" -#include "tao/Exception.h" -#include "Utils.h" -#include <iostream> -#include "string.h" -#include "Utils.h" -#include "Process_Element.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -void -CAP_Handler::process_Capability (Deployment::Capability &cap) -{ - //Check if the Schema IDs for both the elements match - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName ()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:Capability"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "name", cap.name)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (this->iter_, node_name, "resourceType", - cap.resourceType)); - else if - (process_sequence_common<Deployment::SatisfierProperty> - (this->doc_, this->iter_, node, - node_name, "property", cap.property, - &SP_Handler::process_SatisfierProperty, - this->id_map_)); - else - { - this->iter_->previousNode (); - break; - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.h deleted file mode 100644 index 2abfcf09deb..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.h +++ /dev/null @@ -1,97 +0,0 @@ -//================================================================== -/** - * @file Cap_Handler.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//================================================================== - -#ifndef CAP_HANDLER_H -#define CAP_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class CAP_Handler - * - * @brief Handler class for <Capability> type - * - * This class defines handler methods to parse Capability - * types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ -class Config_Handler_Export CAP_Handler: public Basic_Handler -{ -public: - - /// constructor - CAP_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - CAP_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - CAP_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - void process_Capability (Deployment::Capability &ret_struct); - // process elements of type Capability definitions in - // the descriptor files -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* ID_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.cpp deleted file mode 100644 index afccc0c5f0b..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Property_Handler.h" -#include "Requirement_Handler.h" -#include "CAD_Handler.h" -#include "MID_Handler.h" -#include "ID_Handler.h" -#include "Cap_Handler.h" -#include "CompIntrDesc_Handler.h" -#include "CompImplDesc_Handler.h" -#include "Utils.h" -#include "Process_Element.h" -#include <iostream> - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the component implementation description and populate it -void CompImplDesc_Handler::process_ComponentImplementationDescription - (::Deployment::ComponentImplementationDescription &cid) -{ - char* root_node_name_ch = XMLString::transcode - (this->doc_->getDocumentElement ()->getNodeName ()); - ACE_TString root_node_name (root_node_name_ch); - XMLString::release (&root_node_name_ch); - - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - if (node_name == XStr - (ACE_TEXT ("Deployment:ComponentImplementationDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "label", cid.label)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "UUID", cid.UUID)); - else if - (process_element_remote<Deployment::ComponentInterfaceDescription, - CompIntrDesc_Handler> - (this->doc_, this->iter_, node, - node_name, "implements", cid.implements, - &CompIntrDesc_Handler::process_ComponentInterfaceDescription, - this->id_map_)); - else if - (process_sequence_remote<Deployment::ComponentAssemblyDescription, - CAD_Handler> - (this->doc_, this->iter_, node, - node_name, "assemblyImpl", cid.assemblyImpl, - &CAD_Handler::process_ComponentAssemblyDescription, - this->id_map_)); - else if - (process_sequence_remote<Deployment:: - MonolithicImplementationDescription, - MID_Handler> - (this->doc_, this->iter_, node, - node_name, "monolithicImpl", cid.monolithicImpl, - &MID_Handler::process_MonolithicImplementationDescription, - this->id_map_)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "configProperty", cid.configProperty, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_remote<Deployment::Capability, CAP_Handler> - (this->doc_, this->iter_, node, - node_name, "capability", cid.capability, - &CAP_Handler::process_Capability, this->id_map_)); - else if - (process_sequence_common<Deployment::ImplementationDependency> - (this->doc_, this->iter_, node, - node_name, "dependsOn", cid.dependsOn, - &ID_Handler::process_ImplementationDependency, - this->id_map_)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "infoProperty", cid.infoProperty, - &Property_Handler::process_Property, - this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } - return; -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.h b/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.h deleted file mode 100644 index c7918732628..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.h +++ /dev/null @@ -1,87 +0,0 @@ -//================================================================== -/** - * @file CompImplDesc_Handler.h - * - * $Id$ - * - * @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu> - */ -//===================================================================== -#ifndef CompImplDesc_HANDLER_H -#define CompImplDesc_HANDLER_H -#include /**/ "ace/pre.h" - -#include "ciao/DeploymentC.h" -#include "Config_Handler_export.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class CompImplDesc_Handler - * - * @brief Handler class for <ComponentImplementationDescription> type - * - * This class is within the Execution Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the description files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export CompImplDesc_Handler: public Basic_Handler -{ - public: - - /// constructor - CompImplDesc_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - CompImplDesc_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - CompImplDesc_Handler (DOMDocument* doc, - DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the monolithic deployment description - void process_ComponentImplementationDescription (::Deployment::ComponentImplementationDescription &cid); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* CompImplDesc_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.cpp deleted file mode 100644 index 25ca99733fc..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.cpp +++ /dev/null @@ -1,164 +0,0 @@ -//$Id$ - -#ifndef CompIntrDesc_HANDLER_C -#define CompIntrDesc_HANDLER_C - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Utils.h" -#include "Process_Element.h" -#include "Property_Handler.h" -#include "CompIntrDesc_Handler.h" -#include "DT_Handler.h" -#include "CPK_Handler.h" -#include <iostream> - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -void CompIntrDesc_Handler::process_ComponentInterfaceDescription -(::Deployment::ComponentInterfaceDescription &ccd) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ComponentInterfaceDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "label", ccd.label)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "UUID", ccd.UUID)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "specificType", - ccd.specificType)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (this->iter_, node_name, "supportedType", - ccd.supportedType)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (this->iter_, node_name, "idlFile", ccd.idlFile)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "configProperty", ccd.configProperty, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_local<Deployment::ComponentPortDescription> - (this->doc_, this->iter_, node, - node_name, "port", ccd.port, - this, &CompIntrDesc_Handler::process_port)); - else if - (process_sequence_local<Deployment::ComponentPropertyDescription> - (this->doc_, this->iter_, node, - node_name, "property", ccd.property, - this, &CompIntrDesc_Handler::process_comp_property)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "infoProperty", ccd.infoProperty, - &Property_Handler::process_Property, - this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } - return; -} - -/// process component property element -void CompIntrDesc_Handler::process_comp_property (DOMNodeIterator* iter, - Deployment:: - ComponentPropertyDescription& - property) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ComponentPropertyDescription"))) - { - } - else if (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", property.name)); - else if (node_name == XStr (ACE_TEXT ("type"))) - { - int argc = 0; - char ** argv = 0; - CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, ""); - DT_Handler::process_DataType (iter, property.type.out (), orb); - } - else - { - iter->previousNode(); - return; - } - } -} - -/// process port element -void CompIntrDesc_Handler::process_port (DOMNodeIterator* iter, - Deployment:: - ComponentPortDescription& port) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ComponentPortDescription"))) - { - } - else if (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", port.name)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "specificType", port.specificType)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "supportedType", port.supportedType)); - else if - (CIAO::Config_Handler::Utils::process_boolean - (iter, node_name, "provider", port.provider)); - else if - (CIAO::Config_Handler::Utils::process_boolean - (iter, node_name, "exclusiveProvider", - port.exclusiveProvider)); - else if - (CIAO::Config_Handler::Utils::process_boolean - (iter, node_name, "exclusiveUser", port.exclusiveUser)); - else if - (CIAO::Config_Handler::Utils::process_boolean - (iter, node_name, "optional", port.optional)); - else if (node_name == XStr(ACE_TEXT("kind"))) - { - CPK_Handler::process_CCMComponentPortKind (iter, port.kind); - } - else - { - iter->previousNode(); - return; - } - } -} - -END_DEPLOYMENT_NAMESPACE - -#endif /* CompIntrDesc_HANDLER_C */ diff --git a/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.h b/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.h deleted file mode 100644 index 7932ebd4b30..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.h +++ /dev/null @@ -1,89 +0,0 @@ -//$Id$ - -#ifndef COMPINTRDESC_HANDLER_H -#define COMPINTRDESC_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -#include "Basic_Handler.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -class Config_Handler_Export CompIntrDesc_Handler: public Basic_Handler -{ -public: - - /// constructor - CompIntrDesc_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - CompIntrDesc_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { }; - - /// constructor - CompIntrDesc_Handler (DOMDocument* doc, - DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { }; - - /// Process the component package description - void process_ComponentInterfaceDescription (::Deployment::ComponentInterfaceDescription &CompIntrDesc); - -protected: - /// process port element - void process_port (DOMNodeIterator* iter, - Deployment::ComponentPortDescription& port); - - /// process component property element - void process_comp_property (DOMNodeIterator* iter, - Deployment::ComponentPropertyDescription& property); -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif // COMPINTRDESC_HANDLER_H diff --git a/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.cpp deleted file mode 100644 index c60201535cb..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// $Id$ - -#ifndef COMPPKGDESC_HANDLER_C -#define COMPPKGDESC_HANDLER_C - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Utils.h" -#include "CompPkgDesc_Handler.h" -#include "Property_Handler.h" -#include "PCI_Handler.h" -#include "CompIntrDesc_Handler.h" -#include "Process_Element.h" -#include <iostream> - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -void CompPkgDesc_Handler::process_ComponentPackageDescription -(::Deployment::ComponentPackageDescription &comppkgdesc) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ComponentPackageDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "label", comppkgdesc.label)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "UUID", comppkgdesc.UUID)); - else if - (process_element_remote<Deployment::ComponentInterfaceDescription, - CompIntrDesc_Handler> - (this->doc_, this->iter_, node, - node_name, "realizes", comppkgdesc.realizes, - &CompIntrDesc_Handler::process_ComponentInterfaceDescription, - this->id_map_)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "configProperty", comppkgdesc.configProperty, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_remote<Deployment::PackagedComponentImplementation, - PCI_Handler> - (this->doc_, this->iter_, node, - node_name, "implementation", comppkgdesc.implementation, - &PCI_Handler::process_PackagedComponentImplementation, - this->id_map_)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "infoProperty", comppkgdesc.infoProperty, - &Property_Handler::process_Property, - this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } -} - -END_DEPLOYMENT_NAMESPACE - -#endif /* COMPPKGDESC_HANDLER_C */ diff --git a/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.h b/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.h deleted file mode 100644 index 202afca9b2c..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.h +++ /dev/null @@ -1,88 +0,0 @@ -//================================================================== -/** - * @file CompPkgDesc_Handler.h - * - * $Id$ - * - * @author George Edwards <g.edwards@vanderbilt.edu> - */ -//===================================================================== - -#ifndef COMPPKGDESC_HANDLER_H -#define COMPPKGDESC_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" -#include "Basic_Handler.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class CompPkgDesc_Handler - * - * @brief Handler class for <ComponentPackageDescription> type - * - * This class is within the Component Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the description files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export CompPkgDesc_Handler: public Basic_Handler -{ -public: - - /// constructor - CompPkgDesc_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - CompPkgDesc_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - CompPkgDesc_Handler (DOMDocument* doc, - DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the component package description - void process_ComponentPackageDescription (::Deployment::ComponentPackageDescription &comppkgdesc); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* COMPPKGDESC_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Config_Error_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Config_Error_Handler.cpp deleted file mode 100644 index de938a2ce0e..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Config_Error_Handler.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// $Id$ - -#include "ace/Log_Msg.h" -#include "ace/Auto_Ptr.h" -#include <xercesc/util/XMLString.hpp> -#include <xercesc/dom/DOMLocator.hpp> -#include "Config_Error_Handler.h" -#include "XercesString.h" - -using xercesc::XMLString; - -namespace CIAO -{ - namespace Config_Handler - { - Config_Error_Handler::Config_Error_Handler() - : errors_ (false) - {} - - Config_Error_Handler::~Config_Error_Handler() - {} - - - bool Config_Error_Handler::handleError (const DOMError& domError) - { - this->errors_ = true; - if (domError.getSeverity() == DOMError::DOM_SEVERITY_WARNING) - { - ACE_ERROR ((LM_ERROR, "Warning ")); - } - else if (domError.getSeverity() == DOMError::DOM_SEVERITY_ERROR) - { - ACE_ERROR ((LM_ERROR, "Error ")); - } - else - { - ACE_ERROR ((LM_ERROR, "FatalError ")); - } - - char *msg = XMLString::transcode(domError.getMessage()); - char *url = XMLString::transcode (domError.getLocation()->getURI()); - ACE_Auto_Basic_Array_Ptr<char> cleanup_msg (msg); - ACE_ERROR ((LM_ERROR, "while processing resource '%s', " - "Line %d, Position %d : %s\n", - url, - domError.getLocation()->getLineNumber(), - domError.getLocation()->getColumnNumber(), - msg)); - return true; - } - - void Config_Error_Handler::resetErrors() - { - this->errors_ = false; - } - - bool Config_Error_Handler::getErrors() const - { - return this->errors_; - } - } - -} diff --git a/TAO/CIAO/DnC/Config_Handlers/Config_Error_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Config_Error_Handler.h deleted file mode 100644 index 4c039938d90..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Config_Error_Handler.h +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -#ifndef CONFIG_ERROR_HANDLER_H -#define CONFIG_ERROR_HANDLER_H - -#include /**/ "ace/pre.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include <xercesc/dom/DOMErrorHandler.hpp> -#include "Config_Handler_export.h" - -using xercesc::DOMErrorHandler; -using xercesc::DOMError; - -namespace CIAO -{ - namespace Config_Handler - { - class Config_Handler_Export Config_Error_Handler : public DOMErrorHandler - { - public: - - Config_Error_Handler (); - - ~Config_Error_Handler (); - - bool handleError (const DOMError& domError); - - void resetErrors (); - - bool getErrors() const; - - private : - // Disallow copying - Config_Error_Handler (const Config_Error_Handler&); - Config_Error_Handler& operator= (const Config_Error_Handler&); - - bool errors_; - - }; - - }; -} - -#include /**/ "ace/post.h" - -#endif /* CONFIG_ERROR_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Config_Handler_export.h b/TAO/CIAO/DnC/Config_Handlers/Config_Handler_export.h deleted file mode 100644 index 0c9beba35b9..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Config_Handler_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s Config_Handler -// ------------------------------ -#ifndef CONFIG_HANDLER_EXPORT_H -#define CONFIG_HANDLER_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CONFIG_HANDLER_HAS_DLL) -# define CONFIG_HANDLER_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CONFIG_HANDLER_HAS_DLL */ - -#if !defined (CONFIG_HANDLER_HAS_DLL) -# define CONFIG_HANDLER_HAS_DLL 1 -#endif /* ! CONFIG_HANDLER_HAS_DLL */ - -#if defined (CONFIG_HANDLER_HAS_DLL) && (CONFIG_HANDLER_HAS_DLL == 1) -# if defined (CONFIG_HANDLER_BUILD_DLL) -# define Config_Handler_Export ACE_Proper_Export_Flag -# define CONFIG_HANDLER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CONFIG_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CONFIG_HANDLER_BUILD_DLL */ -# define Config_Handler_Export ACE_Proper_Import_Flag -# define CONFIG_HANDLER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CONFIG_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CONFIG_HANDLER_BUILD_DLL */ -#else /* CONFIG_HANDLER_HAS_DLL == 1 */ -# define Config_Handler_Export -# define CONFIG_HANDLER_SINGLETON_DECLARATION(T) -# define CONFIG_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CONFIG_HANDLER_HAS_DLL == 1 */ - -// Set CONFIG_HANDLER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CONFIG_HANDLER_NTRACE) -# if (ACE_NTRACE == 1) -# define CONFIG_HANDLER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CONFIG_HANDLER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CONFIG_HANDLER_NTRACE */ - -#if (CONFIG_HANDLER_NTRACE == 1) -# define CONFIG_HANDLER_TRACE(X) -#else /* (CONFIG_HANDLER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CONFIG_HANDLER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CONFIG_HANDLER_NTRACE == 1) */ - -#endif /* CONFIG_HANDLER_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc deleted file mode 100644 index 54c692644b8..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc +++ /dev/null @@ -1,47 +0,0 @@ -//$Id$ - -project (Config_Handlers) : ciao_deployment_stub { - - sharedname = Config_Handlers - dynamicflags = CONFIG_HANDLER_BUILD_DLL - macros += XML_USE_PTHREADS - includes += /usr/include $(XERCESCROOT)/include - libpaths += /usr/lib $(XERCESCROOT)/lib - libs += xerces-c CIAO_DnC_Server TAO_IFR_Client - - Source_Files { - Utils.cpp - Any_Handler.cpp - Basic_Handler.cpp - CAD_Handler.cpp - Cap_Handler.cpp - CEPE_Handler.cpp - CompImplDesc_Handler.cpp - CompIntrDesc_Handler.cpp - CompPkgDesc_Handler.cpp - Config_Error_Handler.cpp - CPK_Handler.cpp - CPR_Handler.cpp - DnC_Dump.cpp - Domain_Handler.cpp - DT_Handler.cpp - ERE_Handler.cpp - IAD_Handler.cpp - ID_Handler.cpp - IR_Handler.cpp - MID_Handler.cpp - NIA_Handler.cpp - PC_Handler.cpp - PCI_Handler.cpp - Plan_Handler.cpp - Process_Element.cpp - Property_Handler.cpp - Requirement_Handler.cpp - RS_Handler.cpp - RUK_Handler.cpp - SP_Handler.cpp - SPK_Handler.cpp - TPD_Handler.cpp - XercesString.cpp - } -} diff --git a/TAO/CIAO/DnC/Config_Handlers/DT_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/DT_Handler.cpp deleted file mode 100644 index 7840e86caa2..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/DT_Handler.cpp +++ /dev/null @@ -1,103 +0,0 @@ -//$Id$ - -#include "DT_Handler.h" -#include "tao/Typecode.h" -#include "ace/Auto_Ptr.h" -#include "Utils.h" - -void -CIAO::Config_Handler::DT_Handler::process_basic_tc (DOMNodeIterator * iter, - ::CORBA::TypeCode_ptr &type) -{ - - // For all types defined return the appropriate typecode - char * code_value = Utils::parse_string (iter); - auto_ptr<char> cleanup_char (code_value); - - // For this piece of code to work, it is necessary that ORB_init - // be called by the top level handler which calls the - // process_DataType common handler. - if (ACE_OS::strcmp (code_value, - "tk_null") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_null); - else if (ACE_OS::strcmp (code_value, - "tk_short") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_short); - else if (ACE_OS::strcmp (code_value, - "tk_long") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_long); - else if (ACE_OS::strcmp (code_value, - "tk_ushort") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort); - else if (ACE_OS::strcmp (code_value, - "tk_ulong") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong); - else if (ACE_OS::strcmp (code_value, - "tk_float") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_float); - else if (ACE_OS::strcmp (code_value, - "tk_double") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_double); - else if (ACE_OS::strcmp (code_value, - "tk_boolean") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean); - else if (ACE_OS::strcmp (code_value, - "tk_char") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_char); - else if (ACE_OS::strcmp (code_value, - "tk_octet") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet); - else if (ACE_OS::strcmp (code_value, - "tk_string") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_string); - else if (ACE_OS::strcmp (code_value, - "tk_longlong") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong); - else if (ACE_OS::strcmp (code_value, - "tk_ulonglong") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong); - else if (ACE_OS::strcmp (code_value, - "tk_longdouble") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble); - else if (ACE_OS::strcmp (code_value, - "tk_wchar") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar); - else if (ACE_OS::strcmp (code_value, - "tk_wstring") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring); - else if (ACE_OS::strcmp (code_value, - "tk_any") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_any); - else if (ACE_OS::strcmp (code_value, - "tk_TypeCode") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode); - else if (ACE_OS::strcmp (code_value, - "tk_Object") == 0) - type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object); - else - { - ACE_DEBUG ((LM_DEBUG, "Config_Handlers::DT_Handler::process_Datatype \ - unsupported TCkind value %s encountered \ - abortingi\n", type)); - ACE_THROW (CORBA::INTERNAL ()); - } -} - -void -CIAO::Config_Handler::DT_Handler::process_DataType (DOMNodeIterator * iter, - ::CORBA::TypeCode_ptr &type, - ::CORBA::ORB_ptr ) -{ - DOMNode * node = iter->nextNode (); - XStr name (node->getNodeName ()); - if (name == XStr (ACE_TEXT ("kind"))) - DT_Handler::process_basic_tc (iter, type); - else - { - ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Property_Handler::process_ \ - DataType supports only TCKind types\ - support for recursive types will be added later\n")); - ACE_THROW (CORBA::INTERNAL ()); - - } -} diff --git a/TAO/CIAO/DnC/Config_Handlers/DT_Handler.h b/TAO/CIAO/DnC/Config_Handlers/DT_Handler.h deleted file mode 100644 index faac487e828..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/DT_Handler.h +++ /dev/null @@ -1,68 +0,0 @@ -//================================================================== -/** - * @file DT_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef DT_HANDLER_H -#define DT_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "tao/ORB.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class DT_Handler - * - * @brief Handler class for <type> tag - * - * This class defines handler methods to parse the aforementioned type - * in the descriptor files. The corresponding CORBA IDL mapped type in this - * a CORBA::Typecode is created and returned. Dynamic creation of typecodes - * also requires operations defined on the ORB interface, hence the - * process_DataType requires an ORB_ptr as a formal parameter. - */ - - class Config_Handler_Export DT_Handler - { - public: - static void process_DataType (DOMNodeIterator * iter, - ::CORBA::TypeCode_ptr &type, - ::CORBA::ORB_ptr orb); - // process <type> definitions in the descriptor files - private: - static void process_basic_tc (DOMNodeIterator * iter, - ::CORBA::TypeCode_ptr &type); - // process <Deployment:TCKind> definitions in the descriptor - // files - }; - } -} - -#include /**/ "ace/post.h" - -#endif /* DT_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Deployment.h b/TAO/CIAO/DnC/Config_Handlers/Deployment.h deleted file mode 100644 index a3fc3b72004..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Deployment.h +++ /dev/null @@ -1,17 +0,0 @@ -//================================================================== -/** - * @file Deployment.h - * - * $Id$ - * - * @author Emre Turkay <emre.turkay@vanderbilt.edu> - */ -//===================================================================== - -#ifndef DEPLOYMENT_H -#define DEPLOYMENT_H - -#define BEGIN_DEPLOYMENT_NAMESPACE namespace CIAO { namespace Config_Handler { -#define END_DEPLOYMENT_NAMESPACE }; }; - -#endif // DEPLOYMENT_H diff --git a/TAO/CIAO/DnC/Config_Handlers/DnC_Dump.cpp b/TAO/CIAO/DnC/Config_Handlers/DnC_Dump.cpp deleted file mode 100644 index e0f0fc87c36..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/DnC_Dump.cpp +++ /dev/null @@ -1,1049 +0,0 @@ -// $Id$ - -#ifndef DNC_DUMP_C -#define DNC_DUMP_C - -#include "ace/Log_Msg.h" - -#include "DnC_Dump.h" -#include <iostream> -#include <string> -#include <map> - -namespace Deployment -{ -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - /* - * Generic dump functions - */ - - /* - * class Dump_Obj handles the indentation and keeps a map of - structures for reference look-up. - */ - class Dump_Obj { - public: - // Exception thrown when there is a node with the same name in the map - class Node_Exist { }; - // Exception thrown when there is no node with the name given in the map - class Node_Not_Exist { }; - - // Constructor prints out the caption and increases indent - Dump_Obj(const char* caption) - : desc_() - { - ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption)); - indent_.append(" "); - } - - // Constructor prints out the caption, increases indent and inserts - // the given desc into the map - template <typename DESC> - Dump_Obj(const char* caption, DESC &desc) - : desc_(caption) - { - ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption)); - indent_.append(" "); - - if (desc_map_.find(std::string(caption)) != desc_map_.end()) - { - ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \ - The item with name %s is already in \ - the node map.\n", caption)); - throw Node_Exist(); - } - else - { - CORBA::Any val; - val <<= desc; - desc_map_[std::string(caption)] = val; - } - } - - // Destructor - ~Dump_Obj() - { - indent_.erase(indent_.size() - 2, 2); - if (desc_.size() != 0) - { - if (desc_map_.find(desc_) != desc_map_.end()) - { - desc_map_.erase(desc_map_.find(desc_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \ - The item with name %s is not in the node map.\n", - desc_.c_str())); - throw Node_Not_Exist(); - } - } - } - - // return the indent string - static const char* indent() - { - return indent_.c_str(); - } - - // reference lookup within the map - template <typename DESC> - static const DESC& desc(const char* caption) - { - static DESC* val; - desc_map_[caption] >>= val; - return *val; - } - - private: - // indent string - static std::string indent_; - // map for reference lookup - static std::map<std::string, CORBA::Any> desc_map_; - // descriptor - used by destructor for deleting the - // correct descriptor from the map - std::string desc_; - }; - - // static member initialization - std::string Dump_Obj::indent_ = "-"; - std::map<std::string, CORBA::Any> Dump_Obj::desc_map_; - - // Dumps a string sequence - void DnC_Dump::dump (const char* caption, const ::CORBA::StringSeq &str_seq) - { - CORBA::ULong size = str_seq.length (); - - if (size != 0) - { - Dump_Obj dump_obj (caption); - - for (CORBA::ULong i = 0; i < size; ++i) - { - ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", - Dump_Obj::indent(), caption, i)); - ACE_DEBUG ((LM_DEBUG, "%s %s: \n", - Dump_Obj::indent(), str_seq[i].in ())); - } - } - } - - // Dumps a sequence - template <typename SEQUENCE> - void DnC_Dump::dump_sequence (const char* caption, const SEQUENCE &seq) - { - CORBA::ULong size = seq.length (); - - if (size != 0) - { - Dump_Obj dump_obj(caption); - - for (CORBA::ULong i = 0; i < size; ++i) - { - ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(), - caption, i)); - DnC_Dump::dump (seq[i]); - } - } - } - - // Dumps a string - void DnC_Dump::dump (const char* caption, const TAO_String_Manager& str) - { - ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), - caption, str.in())); - } - - // Dumps a boolean - void DnC_Dump::dump (const char* caption, const CORBA::Boolean& val) - { - ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), - caption, val ? "true" : "false")); - } - - // Dumps a reference - template <typename ROOT, typename REFERENCE, typename DATA_TYPE, - typename CLASS> - void DnC_Dump::dump_ref (const char* caption, REFERENCE& ref, - const char* root, DATA_TYPE CLASS::*data) - { - ACE_DEBUG ((LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption)); - const ROOT &root_obj = Dump_Obj::desc<ROOT>(root); - - int value = ref; - ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n", - Dump_Obj::indent(), caption, - (root_obj.*data)[value].name.in())); - } - - // Dumps a reference sequence - template <typename ROOT, typename SEQUENCE, typename DATA_TYPE, - typename CLASS> - void DnC_Dump::dump_ref_seq (const char* caption, SEQUENCE& seq, - const char* root, DATA_TYPE CLASS::*data) - { - ACE_DEBUG ((LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption)); - for (size_t i = 0; i < seq.length(); ++i) - { - const ROOT &root_obj = Dump_Obj::desc<ROOT>(root); - - int value = seq[i]; - ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n", - Dump_Obj::indent(), caption, i, - (root_obj.*data)[value].name.in())); - } - } - - /* - * Object dump methods - */ - - // SatisfierProperty - void DnC_Dump::dump (const Deployment::SatisfierProperty& sp) - { - Dump_Obj dump_obj("SatisfierProperty"); - dump ("name", sp.name); - - ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent())); - switch (sp.kind) { - case Quantity: ACE_DEBUG ((LM_DEBUG, "Quantity\n")); break; - case Capacity: ACE_DEBUG ((LM_DEBUG, "Capacity\n")); break; - case Minimum: ACE_DEBUG ((LM_DEBUG, "Minimum\n")); break; - case Maximum: ACE_DEBUG ((LM_DEBUG, "Maximum\n")); break; - case Attribute: ACE_DEBUG ((LM_DEBUG, "Attribute\n")); break; - case Selection: ACE_DEBUG ((LM_DEBUG, "Selection\n")); break; - } - - ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent())); - dump (sp.value); - } - - // SharedResource - void DnC_Dump::dump (const Deployment::SharedResource& sr) - { - Dump_Obj dump_obj("SharedResource"); - dump ("name", sr.name); - dump ("resourceType", sr.resourceType); - dump_ref_seq<Deployment::Domain> ("nodeRef", sr.nodeRef, - "Domain", &Domain::node); - dump_sequence ("property", sr.property); - } - - // Resource - void DnC_Dump::dump (const Deployment::Resource& resource) - { - Dump_Obj dump_obj("Resource"); - dump ("name", resource.name); - dump ("resourceType", resource.resourceType); - dump_sequence ("property", resource.property); - } - - // Node - void DnC_Dump::dump (const Deployment::Node& node) - { - Dump_Obj dump_obj("Node"); - dump ("name", node.name); - dump ("label", node.label); - dump_ref_seq<Deployment::Domain> ("sharedResourceRef", - node.sharedResourceRef, "Domain", - &Domain::sharedResource); - dump_ref_seq<Deployment::Domain> ("connectionRef", node.connectionRef, - "Domain", &Domain::interconnect); - dump_sequence ("resource", node.resource); - } - - // Interconnect - void DnC_Dump::dump (const Deployment::Interconnect& conn) - { - Dump_Obj dump_obj("Interconnect"); - dump ("name", conn.name); - dump ("label", conn.label); - dump_ref_seq<Deployment::Domain> ("connectionRef", conn.connectionRef, - "Domain", &Domain::bridge); - dump_ref_seq<Deployment::Domain> ("connectRef", conn.connectRef, - "Domain", &Domain::node); - dump_sequence ("resource", conn.resource); - } - - // Bridge - void DnC_Dump::dump (const Deployment::Bridge& bridge) - { - Dump_Obj dump_obj("Bridge"); - dump ("name", bridge.name); - dump ("label", bridge.label); - dump_ref_seq<Deployment::Domain> ("connectRef", bridge.connectRef, - "Domain", &Domain::interconnect); - dump_sequence ("resource", bridge.resource); - } - - void DnC_Dump::dump (const ::Deployment::Domain &domain) - { - Dump_Obj dump_obj("Domain", domain); - dump ("UUID", domain.UUID); - dump ("label", domain.label); - - dump_sequence ("sharedResource", domain.sharedResource); - dump_sequence ("node", domain.node); - dump_sequence ("interconnect", domain.interconnect); - dump_sequence ("bridge", domain.bridge); - dump_sequence ("infoProperty", domain.infoProperty); - } - - // ComponentPortDescription - - void DnC_Dump::dump (const ::Deployment::ComponentPortDescription - &compportdesc) - { - Dump_Obj dump_obj("ComponentPortDescription"); - - dump ("name", compportdesc.name); - dump ("specificType", compportdesc.specificType); - dump ("supportedType", compportdesc.supportedType); - dump ("provider", compportdesc.provider); - dump ("exclusiveProvider", compportdesc.exclusiveProvider); - dump ("exclusiveUser", compportdesc.exclusiveUser); - dump ("optional", compportdesc.optional); - - ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent())); - switch (compportdesc.kind) { - case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\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; - case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break; - case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break; - } - } - - // ComponentPropertyDescription - - void DnC_Dump::dump (const ::Deployment::ComponentPropertyDescription &comppropdesc) - { - Dump_Obj dump_obj("ComponentPropertyDescription"); - - dump ("name", comppropdesc.name); - - ACE_DEBUG ((LM_DEBUG, "%stype: ", Dump_Obj::indent())); - switch (comppropdesc.type.in()->kind()) { - case ::CORBA::tk_null: ACE_DEBUG ((LM_DEBUG, "tk_null\n")); break; - case ::CORBA::tk_void: ACE_DEBUG ((LM_DEBUG, "tk_void\n")); break; - case ::CORBA::tk_short: ACE_DEBUG ((LM_DEBUG, "tk_short\n")); break; - case ::CORBA::tk_long: ACE_DEBUG ((LM_DEBUG, "tk_long\n")); break; - case ::CORBA::tk_ushort: ACE_DEBUG ((LM_DEBUG, "tk_ushort\n")); break; - case ::CORBA::tk_ulong: ACE_DEBUG ((LM_DEBUG, "tk_ulong\n")); break; - case ::CORBA::tk_float: ACE_DEBUG ((LM_DEBUG, "tk_float\n")); break; - case ::CORBA::tk_double: ACE_DEBUG ((LM_DEBUG, "tk_double\n")); break; - case ::CORBA::tk_boolean: ACE_DEBUG ((LM_DEBUG, "tk_boolean\n")); break; - case ::CORBA::tk_char: ACE_DEBUG ((LM_DEBUG, "tk_char\n")); break; - case ::CORBA::tk_octet: ACE_DEBUG ((LM_DEBUG, "tk_octet\n")); break; - case ::CORBA::tk_any: ACE_DEBUG ((LM_DEBUG, "tk_any\n")); break; - case ::CORBA::tk_TypeCode: ACE_DEBUG ((LM_DEBUG, "tk_TypeCode\n")); break; - case ::CORBA::tk_Principal: ACE_DEBUG ((LM_DEBUG, "tk_Principal\n")); break; - case ::CORBA::tk_objref: ACE_DEBUG ((LM_DEBUG, "tk_objref\n")); break; - case ::CORBA::tk_struct: ACE_DEBUG ((LM_DEBUG, "tk_struct\n")); break; - case ::CORBA::tk_union: ACE_DEBUG ((LM_DEBUG, "tk_union\n")); break; - case ::CORBA::tk_enum: ACE_DEBUG ((LM_DEBUG, "tk_enum\n")); break; - case ::CORBA::tk_string: ACE_DEBUG ((LM_DEBUG, "tk_string\n")); break; - case ::CORBA::tk_sequence: ACE_DEBUG ((LM_DEBUG, "tk_sequence\n")); break; - case ::CORBA::tk_array: ACE_DEBUG ((LM_DEBUG, "tk_array\n")); break; - case ::CORBA::tk_alias: ACE_DEBUG ((LM_DEBUG, "tk_alias\n")); break; - case ::CORBA::tk_except: ACE_DEBUG ((LM_DEBUG, "tk_except\n")); break; - case ::CORBA::tk_longlong: ACE_DEBUG ((LM_DEBUG, "tk_longlong\n")); break; - case ::CORBA::tk_ulonglong: ACE_DEBUG ((LM_DEBUG, "tk_ulonglong\n")); break; - case ::CORBA::tk_longdouble: ACE_DEBUG ((LM_DEBUG, "tk_longdouble\n")); break; - case ::CORBA::tk_wchar: ACE_DEBUG ((LM_DEBUG, "tk_wchar\n")); break; - case ::CORBA::tk_wstring: ACE_DEBUG ((LM_DEBUG, "tk_wstring\n")); break; - case ::CORBA::tk_fixed: ACE_DEBUG ((LM_DEBUG, "tk_fixed\n")); break; - case ::CORBA::tk_value: ACE_DEBUG ((LM_DEBUG, "tk_value\n")); break; - case ::CORBA::tk_value_box: ACE_DEBUG ((LM_DEBUG, "tk_value_box\n")); break; - case ::CORBA::tk_native: ACE_DEBUG ((LM_DEBUG, "tk_native\n")); break; - case ::CORBA::tk_abstract_interface: ACE_DEBUG ((LM_DEBUG, "tk_abstract_interface\n")); break; - case ::CORBA::tk_local_interface: ACE_DEBUG ((LM_DEBUG, "tk_local_interface\n")); break; - case ::CORBA::tk_component: ACE_DEBUG ((LM_DEBUG, "tk_component\n")); break; - case ::CORBA::tk_home: ACE_DEBUG ((LM_DEBUG, "tk_home\n")); break; - case ::CORBA::tk_event: ACE_DEBUG ((LM_DEBUG, "tk_event\n")); break; - default: - break; - }; - } - - // ComponentInterfaceDescription - - void DnC_Dump::dump (const ::Deployment::ComponentInterfaceDescription &cid) - { - Dump_Obj dump_obj("ComponentInterfaceDescription"); - dump ("label", cid.label); - dump ("UUID", cid.UUID); - dump ("specificType", cid.specificType); - dump ("supportedType", cid.supportedType); - dump ("idlFile", cid.idlFile); - dump_sequence ("configProperty", cid.configProperty); - dump_sequence ("port", cid.port); - dump_sequence ("property", cid.property); - dump_sequence ("infoProperty", cid.infoProperty); - } - - // Requirement - - void DnC_Dump::dump (const ::Deployment::Requirement &req) - { - Dump_Obj dump_obj("Requirement"); - - dump ("resourceType", req.resourceType); - dump ("name", req.name); - dump_sequence ("property", req.property); - } - - // MonolithicDeploymentDescription - - void DnC_Dump::dump(const Deployment::MonolithicDeploymentDescription &mdd) - { - Dump_Obj dump_obj("MonolithicDeploymentDescription"); - - dump ("name", mdd.name); - dump ("source", mdd.source); - dump_ref_seq<Deployment::DeploymentPlan> ("artifactRef", mdd.artifactRef, - "DeploymentPlan", - &DeploymentPlan::artifact); - dump_sequence ("execParameter", mdd.execParameter); - dump_sequence ("deployRequirement", mdd.deployRequirement); - } - - // ResourceUsageKind - - void DnC_Dump::dump(const Deployment::ResourceUsageKind &ruk) - { - ACE_DEBUG ((LM_DEBUG, "%sresourceUsage: ", Dump_Obj::indent())); - switch (ruk) { - case None: ACE_DEBUG ((LM_DEBUG, "None\n")); break; - case InstanceUsesResource: ACE_DEBUG ((LM_DEBUG, "InstanceUsesResource\n")); break; - case ResourceUsesInstance: ACE_DEBUG ((LM_DEBUG, "ResourceUsesInstance\n")); break; - case PortUsesResource: ACE_DEBUG ((LM_DEBUG, "PortUsesResource\n")); break; - case ResourceUsesPort: ACE_DEBUG ((LM_DEBUG, "ResourceUsesPort\n")); break; - } - } - - // InstanceResourceDeploymentDescription - - void DnC_Dump::dump(const Deployment::InstanceResourceDeploymentDescription &irdd) - { - Dump_Obj dump_obj("InstanceResourceDeploymentDescription"); - - dump (irdd.resourceUsage); - dump ("requirementName", irdd.requirementName); - dump ("resourceName", irdd.resourceName); - ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); - dump (irdd.resourceValue); - } - - // InstanceDeploymentDescription - - void DnC_Dump::dump(const Deployment::InstanceDeploymentDescription &idd) - { - Dump_Obj dump_obj("InstanceDeploymentDescription"); - - dump ("name", idd.name); - dump ("node", idd.node); - dump ("source", idd.source); - dump_ref<Deployment::DeploymentPlan> ("implementationRef", - idd.implementationRef, - "DeploymentPlan", - &DeploymentPlan::implementation); - dump_sequence ("configProperty", idd.configProperty); - dump_sequence ("deployedResource", idd.deployedResource); - dump_sequence ("deployedSharedResource", idd.deployedSharedResource); - } - - // ComponentExternalPortEndpoint - - void DnC_Dump::dump (const ::Deployment::ComponentExternalPortEndpoint &cepe) - { - Dump_Obj dump_obj("ComponentExternalPortEndpoint"); - - dump ("portName", cepe.portName); - } - - // PlanSubcomponentPortEndpoint - - void DnC_Dump::dump(const Deployment::PlanSubcomponentPortEndpoint &pspe) - { - Dump_Obj dump_obj("PlanSubcomponentPortEndpoint"); - - dump ("portName", pspe.portName); - dump ("provider", pspe.provider); - ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent())); - switch (pspe.kind) { - case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\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; - case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break; - case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break; - } - dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspe.instanceRef, - "DeploymentPlan", - &DeploymentPlan::instance); - } - - // ExternalReferenceEndpoint - - void DnC_Dump::dump (const ::Deployment::ExternalReferenceEndpoint &ere) - { - Dump_Obj dump_obj("ExternalReferenceEndpoint"); - - dump ("location", ere.location); - } - - // ConnectionResourceDeploymentDescription - - void DnC_Dump::dump(const Deployment::ConnectionResourceDeploymentDescription &crdd) - { - Dump_Obj dump_obj("ConnectionResourceDeploymentDescription"); - - dump ("targetName", crdd.targetName); - dump ("requirementName", crdd.requirementName); - dump ("resourceName", crdd.resourceName); - ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); - dump (crdd.resourceValue); - } - - // PlanConnectionDescription - - void DnC_Dump::dump(const Deployment::PlanConnectionDescription &pcd) - { - Dump_Obj dump_obj("PlanConnectionDescription"); - - dump ("name", pcd.name); - dump ("source", pcd.source); - dump_sequence ("deployRequirement", pcd.deployRequirement); - dump_sequence ("externalEndpoint", pcd.externalEndpoint); - dump_sequence ("internalEndpoint", pcd.internalEndpoint); - dump_sequence ("externalReference", pcd.externalReference); - dump_sequence ("deployedResource", pcd.deployedResource); - } - - // PlanSubcomponentPropertyReference - - void DnC_Dump::dump(const Deployment::PlanSubcomponentPropertyReference &pspr) - { - Dump_Obj dump_obj("PlanSubcomponentPropertyReference"); - - dump ("propertyName", pspr.propertyName); - - dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspr.instanceRef, - "DeploymentPlan", - &DeploymentPlan::instance); - } - - // PlanPropertyMapping - - void DnC_Dump::dump(const Deployment::PlanPropertyMapping &ppm) - { - Dump_Obj dump_obj("PlanPropertyMapping"); - - dump ("name", ppm.name); - dump ("source", ppm.source); - dump ("externalName", ppm.externalName); - dump_sequence ("delegatesTo", ppm.delegatesTo); - } - - // ImplementationDependency - - void DnC_Dump::dump(const Deployment::ImplementationDependency &id) - { - Dump_Obj dump_obj("ImplementationDependency"); - - dump ("requiredType", id.requiredType); - } - - // ResourceDeploymentDescription - - void DnC_Dump::dump(const Deployment::ResourceDeploymentDescription &rdd) - { - Dump_Obj dump_obj("ResourceDeploymentDescription"); - - dump ("requirementName", rdd.requirementName); - dump ("resourceName", rdd.resourceName); - ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); - dump (rdd.resourceValue); - } - - // ArtifactDeploymentDescription - - void DnC_Dump::dump(const Deployment::ArtifactDeploymentDescription &add) - { - Dump_Obj dump_obj("ArtifactDeploymentDescription"); - - dump ("name", add.name); - dump ("location", add.location); - dump ("node", add.node); - dump ("source", add.source); - dump_sequence ("execParameter", add.execParameter); - dump_sequence ("deployRequirement", add.deployRequirement); - dump_sequence ("deployedResource", add.deployedResource); - } - - void DnC_Dump::dump(const Deployment::DeploymentPlan &plan) - { - Dump_Obj dump_obj("DeploymentPlan", plan); - - dump ("label", plan.label); - dump ("UUID", plan.UUID); - dump (plan.realizes); - dump_sequence ("implementation", plan.implementation); - dump_sequence ("instance", plan.instance); - dump_sequence ("connection", plan.connection); - dump_sequence ("externalProperty", plan.externalProperty); - dump_sequence ("dependsOn", plan.dependsOn); - dump_sequence ("artifact", plan.artifact); - dump_sequence ("infoProperty", plan.infoProperty); - } - - // ComponentPackageReference - - void DnC_Dump::dump (const ::Deployment::ComponentPackageReference &cpr) - { - Dump_Obj dump_obj("ComponentPackageReference"); - - dump ("requiredUUID", cpr.requiredUUID); - dump ("requiredName", cpr.requiredName); - dump ("requiredType", cpr.requiredType); - } - - // SubcomponentInstantiationDescription - - void DnC_Dump::dump (const ::Deployment::SubcomponentInstantiationDescription &sid) - { - Dump_Obj dump_obj("SubcomponentInstantiationDescription"); - - dump ("name", sid.name); - dump_sequence ("package", sid.package); - dump_sequence ("configProperty", sid.configProperty); - dump_sequence ("selectRequirement", sid.selectRequirement); - dump_sequence ("reference", sid.reference); - } - - // SubcomponentPortEndpoint - - void DnC_Dump::dump (const ::Deployment::SubcomponentPortEndpoint& spe) - { - Dump_Obj dump_obj("SubcomponentPortEndpoint"); - - dump ("portName", spe.portName); - int value = spe.instanceRef; - ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (), - Dump_Obj::desc<Deployment::ComponentAssemblyDescription> - ("ComponentAssemblyDescription").instance[value].name.in ())); - } - - // AssemblyConnectionDescription - - void DnC_Dump::dump (const ::Deployment::AssemblyConnectionDescription &acd) - { - Dump_Obj dump_obj("AssemblyConnectionDescription"); - - dump ("name", acd.name); - dump_sequence ("deployRequirement", acd.deployRequirement); - dump_sequence ("externalEndpoint", acd.externalEndpoint); - dump_sequence ("internalEndpoint", acd.internalEndpoint); - dump_sequence ("externalReference", acd.externalReference); - } - - // SubcomponentPropertyReference - - void DnC_Dump::dump (const ::Deployment::SubcomponentPropertyReference &spr) - { - Dump_Obj dump_obj("SubcomponentPropertyReference"); - - dump ("propertyName", spr.propertyName); - int value = spr.instanceRef; - ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (), - Dump_Obj::desc<Deployment::ComponentAssemblyDescription> - ("ComponentAssemblyDescription").instance[value].name.in ())); - } - - // AssemblyPropertyMapping - - void DnC_Dump::dump (const ::Deployment::AssemblyPropertyMapping &apm) - { - Dump_Obj dump_obj("AssemblyPropertyMapping"); - - dump ("name", apm.name); - dump ("externalName", apm.externalName); - dump_sequence ("delegatesTo", apm.delegatesTo); - } - - // ComponentAssemblyDescription - - void DnC_Dump::dump (const ::Deployment::ComponentAssemblyDescription& cad) - { - Dump_Obj dump_obj("ComponentAssemblyDescription", cad); - - dump_sequence ("instance", cad.instance); - dump_sequence ("connection", cad.connection); - dump_sequence ("externalProperty", cad.externalProperty); - } - - // ImplementationArtifactDescription - - void DnC_Dump::dump (const ::Deployment::ImplementationArtifactDescription &iad) - { - Dump_Obj dump_obj("ImplementationArtifactDescription"); - - dump ("label", iad.label); - dump ("UUID", iad.UUID); - dump ("location", iad.location); - dump_sequence ("execParameter", iad.execParameter); - dump_sequence ("deployRequirement", iad.deployRequirement); - dump_sequence ("dependsOn", iad.dependsOn); - dump_sequence ("infoProperty", iad.infoProperty); - } - - // NamedImplementationArtifact - - void DnC_Dump::dump (const ::Deployment::NamedImplementationArtifact &nia) - { - Dump_Obj dump_obj("NamedImplementationArtifact"); - - dump ("name", nia.name); - dump (nia.referencedArtifact); - } - - // ImplementationRequirement - - void DnC_Dump::dump (const ::Deployment::ImplementationRequirement &ir) - { - Dump_Obj dump_obj("ImplementationRequirement"); - - dump_sequence ("resourceUsage", ir.resourceUsage); - dump ("resourcePort", ir.resourcePort); - dump ("componentPort", ir.componentPort); - dump ("resourceType", ir.resourceType); - dump ("name", ir.name); - dump_sequence ("property", ir.property); - } - - // MonolithicImplementationDescription - - void DnC_Dump::dump (const ::Deployment::MonolithicImplementationDescription - &mid) - { - Dump_Obj dump_obj("MonolithicImplementationDescription"); - - dump_sequence ("execParameter", mid.execParameter); - dump_sequence ("primaryArtifact", mid.primaryArtifact); - dump_sequence ("deployRequirement", mid.deployRequirement); - } - - // Capability - - void DnC_Dump::dump (const ::Deployment::Capability &capability) - { - Dump_Obj dump_obj("Capability"); - - dump ("name", capability.name); - DnC_Dump::dump ("resourceType", capability.resourceType); - DnC_Dump::dump_sequence ("property", capability.property); - } - - // ComponentImplementationDescription - - void DnC_Dump::dump ( - const ::Deployment::ComponentImplementationDescription &cid) - { - Dump_Obj dump_obj("ComponentImplementationDescription"); - - dump ("label", cid.label); - dump ("UUID", cid.UUID); - ACE_DEBUG ((LM_DEBUG, "%sImplements:\n", Dump_Obj::indent())); - dump (cid.implements); - dump_sequence ("assemblyImpl", cid.assemblyImpl); - dump_sequence ("monolithicImpl", cid.monolithicImpl); - dump_sequence ("configProperty", cid.configProperty); - dump_sequence ("capability", cid.capability); - dump_sequence ("dependsOn", cid.dependsOn); - dump_sequence ("infoProperty", cid.infoProperty); - } - - // PackagedComponentImplementation - - void DnC_Dump::dump (const ::Deployment::PackagedComponentImplementation &pci) - { - Dump_Obj dump_obj("PackagedComponentImplementation"); - - dump ("Name", pci.name); - ACE_DEBUG ((LM_DEBUG, - "%sreferencedImplementation: \n", Dump_Obj::indent())); - DnC_Dump::dump (pci.referencedImplementation); - } - - // ComponentPackageDescription - - void DnC_Dump::dump (const ::Deployment::ComponentPackageDescription - &comppkgdesc) - { - Dump_Obj dump_obj("ComponentPackageDescription"); - - dump ("label", comppkgdesc.label); - dump ("UUID", comppkgdesc.UUID); - ACE_DEBUG ((LM_DEBUG, "%srealizes: \n", Dump_Obj::indent ())); - DnC_Dump::dump (comppkgdesc.realizes); // ComponentInterfaceDescription - dump_sequence ("configProperty", comppkgdesc.configProperty); - dump_sequence ("implementation", comppkgdesc.implementation); - dump_sequence ("infoProperty", comppkgdesc.infoProperty); - } - - // PackageConfiguration - - void DnC_Dump::dump (const ::Deployment::PackageConfiguration &pc) - { - Dump_Obj dump_obj("PackageConfiguration"); - - dump ("label", pc.label); - dump ("UUID", pc.UUID); - dump_sequence ("specializedConfig", pc.specializedConfig); - dump_sequence ("basePackage", pc.basePackage); - dump_sequence ("reference", pc.reference); - dump_sequence ("selectRequirement", pc.selectRequirement); - dump_sequence ("configProperty", pc.configProperty); - } - - // Requirement Satisfier - void DnC_Dump::dump (const Deployment::RequirementSatisfier& rs) - { - Dump_Obj dump_obj("RequirementSatisfier"); - - dump ("name", rs.name); - dump ("resourceType", rs.resourceType); - dump_sequence ("property", rs.property); - } - - // Property - void DnC_Dump::dump (const Deployment::Property& property) - { - Dump_Obj dump_obj("Property"); - dump ("name", property.name); - ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent())); - dump (property.value); - } - - // CORBA::Any - - void DnC_Dump::dump (const ::CORBA::Any &any) - { - ::CORBA::TypeCode * type = any.type (); - switch (type->kind ()) - { - case CORBA::tk_short: - { - CORBA::Short temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\ - encoded different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_null: - ACE_DEBUG ((LM_DEBUG, "%sAny value: null value encoded\n", - Dump_Obj::indent ())); - break; - - case CORBA::tk_void: - ACE_DEBUG ((LM_DEBUG, "Any value: void type encoded \n")); - break; - case CORBA::tk_long: - { - CORBA::Long temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_ushort: - { - CORBA::UShort temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_ulong: - { - CORBA::ULong temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_float: - { - CORBA::Float temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (), - temp)); - } - break; - case CORBA::tk_double: - { - CORBA::Double temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (), - temp)); - } - break; - case CORBA::tk_boolean: - { - CORBA::Boolean temp; - if (! (any >>= CORBA::Any::to_boolean (temp))) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - - if (temp) - ACE_DEBUG ((LM_DEBUG, "Any value: True \n")); - else - ACE_DEBUG ((LM_DEBUG, "Any value: False \n")); - } - break; - - case CORBA::tk_char: - { - CORBA::Char temp; - if (! (any >>= CORBA::Any::to_char (temp))) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_octet: - { - CORBA::Octet temp; - if (! (any >>= CORBA::Any::to_octet (temp))) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_string: - { - const char * temp = 0; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (), - temp)); - } - break; - case CORBA::tk_longlong: - { - CORBA::LongLong temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_longdouble: - { - CORBA::LongDouble temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), - temp)); - } - - break; - case CORBA::tk_wchar: - { - CORBA::WChar temp; - if (! (any >>= CORBA::Any::to_wchar (temp))) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (), - temp)); - } - break; - - case CORBA::tk_wstring: - { - const CORBA::WChar * temp; - if (! (any >>= temp)) - { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\ - encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); - } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (), - temp)); - } - break; - - default: - ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n")); - ACE_THROW (CORBA::INTERNAL ()); - } - } -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES -} - -#endif /* DNC_DUMP_C */ diff --git a/TAO/CIAO/DnC/Config_Handlers/DnC_Dump.h b/TAO/CIAO/DnC/Config_Handlers/DnC_Dump.h deleted file mode 100644 index db09a278158..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/DnC_Dump.h +++ /dev/null @@ -1,176 +0,0 @@ -//================================================================== -/** - * @file DnC_Dump.h - * - * $Id$ - * - * @author Gan Deng <gan.deng@vanderbilt.edu> - */ -//===================================================================== - -#ifndef DNC_DUMP_H -#define DNC_DUMP_H -#include /**/ "ace/pre.h" - -#include "ciao/DeploymentC.h" -#include "Config_Handler_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -namespace Deployment -{ - /** - * @class DnC_Dump - * - * @brief This class defines a set of overloaded "dump" methods to print - * the contents of various IDL data types, which passed as input. - */ - class Config_Handler_Export DnC_Dump - { -/* - * If the compiler has broken nested templates exclude dumping functionality. - */ -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - - public: - /// Dump functions for CORBA sequences - static void DnC_Dump::dump (const char* caption, - const ::CORBA::StringSeq &str_seq); - - template <typename SEQUENCE> - static void dump_sequence (const char* caption, const SEQUENCE &seq); - - template <typename ROOT, typename SEQUENCE, - typename DATA_TYPE, typename CLASS> - static void dump_ref_seq (const char* caption, SEQUENCE& seq, - const char* root, DATA_TYPE CLASS::*data); - - template <typename ROOT, typename REFERENCE, typename DATA_TYPE, - typename CLASS> - static void dump_ref (const char* caption, REFERENCE& ref, - const char* root, DATA_TYPE CLASS::*data); - - static void dump (const char* caption, const TAO_String_Manager& str); - - static void dump (const char* caption, const CORBA::Boolean& val); - - /// A whole slew of overloaded dump routines for different IDL data types. - - static void dump(const Deployment::SatisfierProperty &sp); - - static void dump (const Deployment::SharedResource& sr); - - static void dump (const Deployment::Node& node); - - static void dump (const Deployment::Resource& resource); - - static void dump (const Deployment::Interconnect& conn); - - static void dump (const Deployment::Bridge& bridge); - - static void dump (const ::Deployment::Property &property); - - static void dump (const ::Deployment::AssemblyConnectionDescription &acd); - - static void dump (const ::Deployment::AssemblyPropertyMapping &apm); - - static void dump (const ::Deployment::ComponentPackageDescription - &comppkgdesc); - - static void dump (const ::Deployment::ComponentPortDescription - &compportdesc); - - static void dump (const ::Deployment::ComponentPropertyDescription - &comppropdesc); - - static void dump (const ::Deployment::MonolithicImplementationDescription - &mid); - - static void dump (const ::Deployment::PackageConfiguration &pc); - - static void dump (const ::Deployment::PackagedComponentImplementation - &pci); - - static void dump (const ::Deployment::SubcomponentPortEndpoint &spe); - - static void dump (const ::Deployment::Requirement &requirement); - - static void dump (const ::Deployment::ComponentExternalPortEndpoint - &cepe); - - static void dump (const ::Deployment::ComponentPackageReference &cpr); - - static void dump (const ::Deployment::ComponentImplementationDescription - &cid); - - static void dump (const ::Deployment::SubcomponentInstantiationDescription - &sid); - - static void dump (const ::Deployment::NamedImplementationArtifact - &named_implementation); - - static void dump (const ::Deployment::ComponentInterfaceDescription &cid); - - static void dump (const ::Deployment::SubcomponentPropertyReference - &scpr); - - static void dump (const ::Deployment::ExternalReferenceEndpoint &ere); - - static void dump (const ::Deployment::Domain &domain); - - static void dump (const ::Deployment::Capability &capability); - - static void dump (const ::Deployment::ImplementationArtifactDescription - &iad); - - static void dump (const ::Deployment::ImplementationRequirement &ir); - - static void dump(const Deployment::ResourceUsageKind &ruk); - - static void dump(const Deployment::DeploymentPlan &plan); - - static void dump(const Deployment::MonolithicDeploymentDescription &mdd); - - static void dump(const Deployment::InstanceDeploymentDescription &idd); - - static void dump(const Deployment::PlanConnectionDescription &pcd); - - static void dump(const Deployment::PlanPropertyMapping &ppm); - - static void dump(const Deployment::ImplementationDependency &id); - - static void dump(const Deployment::ArtifactDeploymentDescription &add); - - static void dump(const Deployment::InstanceResourceDeploymentDescription - &irdd); - - static void dump(const PlanSubcomponentPortEndpoint &pspe); - - static void dump(const ConnectionResourceDeploymentDescription &crdd); - - static void dump(const PlanSubcomponentPropertyReference &pspr); - - static void dump(const ResourceDeploymentDescription &rdd); - - static void dump (const ::Deployment::ComponentAssemblyDescription& cad); - - static void dump (const Deployment::RequirementSatisfier& rs); - - private: - static void dump (const ::CORBA::Any &any); - // Helper function to print an Any - -#else // ACE_HAS_BROKEN_NESTED_TEMPLATES - - static void dump(const Deployment::DeploymentPlan &plan) { } - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES - }; -} - -#include /**/ "ace/post.h" - -#endif /* DNC_DUMP_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp deleted file mode 100644 index 5d6d1456e07..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp +++ /dev/null @@ -1,403 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Domain_Handler.h" -#include "Property_Handler.h" -#include "SP_Handler.h" -#include "Process_Element.h" -#include "Utils.h" -#include <iostream> -#include "string.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the Domain type and populate the IDL structure -void Domain_Handler::process_domain (Deployment::Domain& domain) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName ()); - - if (node_name == XStr (ACE_TEXT ("Deployment:Domain"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "UUID", domain.UUID)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "label", domain.label)); - else if - (process_sequence_local<Deployment::SharedResource> - (this->doc_, this->iter_, node, - node_name, "sharedResource", domain.sharedResource, - this, &Domain_Handler::process_sr)); - else if - (process_sequence_local<Deployment::Node> - (this->doc_, this->iter_, node, - node_name, "node", domain.node, - this, &Domain_Handler::process_node)); - else if - (process_sequence_local<Deployment::Interconnect> - (this->doc_, this->iter_, node, - node_name, "interconnect", domain.interconnect, - this, &Domain_Handler::process_interconnect)); - else if - (process_sequence_local<Deployment::Bridge> - (this->doc_, this->iter_, node, - node_name, "bridge", domain.bridge, - this, &Domain_Handler::process_bridge)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "infoProperty", domain.infoProperty, - &Property_Handler::process_Property, - this->id_map_)); - else - { - // ??? How did we get here ??? - ACE_THROW (CORBA::INTERNAL()); - } - } - - this->update_node_refs (domain); - this->update_ic_refs (domain); - this->update_bridge_refs (domain); - this->update_sr_refs (domain); - - return; -} - -void Domain_Handler::process_node (DOMNodeIterator* iter, - Deployment::Node& domain_node) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:Node"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", domain_node.name)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "label", domain_node.label)); - else if - (process_sequence_local<Deployment::Resource> - (node->getOwnerDocument(), iter, node, - node_name, "resource", domain_node.resource, - this, &Domain_Handler::process_resource)); - else if - (process_reference_seq (node, node_name, "connection", - domain_node.connectionRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else if - (process_reference_seq (node, node_name, "sharedResource", - domain_node.sharedResourceRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else - { - iter->previousNode(); - return; - } - } -} - -void Domain_Handler::process_resource (DOMNodeIterator* iter, - Deployment::Resource& domain_resource) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:Resource"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", domain_resource.name)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "resourceType", domain_resource.resourceType)); - else if - (process_sequence_common<Deployment::SatisfierProperty> - (node->getOwnerDocument(), iter, node, - node_name, "property", domain_resource.property, - &SP_Handler::process_SatisfierProperty, - this->id_map_)); - else - { - node = iter->previousNode (); - break; - } - } -} - -void Domain_Handler::process_bridge (DOMNodeIterator* iter, - Deployment::Bridge& domain_bridge) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:Bridge"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", domain_bridge.name)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "label", domain_bridge.label)); - else if - (process_reference_seq (node, node_name, "connect", - domain_bridge.connectRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else if - (process_sequence_local<Deployment::Resource> - (node->getOwnerDocument(), iter, node, - node_name, "resource", domain_bridge.resource, - this, &Domain_Handler::process_resource)); - else - { - iter->previousNode(); - return; - } - } -} - - -void Domain_Handler::process_interconnect (DOMNodeIterator* iter, - Deployment::Interconnect& domain_ic) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:Interconnect"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", domain_ic.name)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "label", domain_ic.label)); - else if - (process_reference_seq (node, node_name, "connect", - domain_ic.connectRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else if - (process_reference_seq (node, node_name, "connection", - domain_ic.connectionRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else if - (process_sequence_local<Deployment::Resource> - (node->getOwnerDocument(), iter, node, - node_name, "resource", domain_ic.resource, - this, &Domain_Handler::process_resource)); - else - { - iter->previousNode(); - return; - } - } -} - - -void Domain_Handler::process_sr (DOMNodeIterator* iter, - Deployment::SharedResource& domain_sr) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:SharedResource"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", domain_sr.name)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "resourceType", - domain_sr.resourceType)); - else if - (process_reference_seq (node, node_name, "node", - domain_sr.nodeRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else if - (process_sequence_common<Deployment::SatisfierProperty> - (node->getOwnerDocument(), iter, node, - node_name, "property", domain_sr.property, - &SP_Handler::process_SatisfierProperty, - this->id_map_)); - else - { - iter->previousNode(); - return; - } - } -} - -void Domain_Handler::update_node_refs (Deployment::Domain& domain) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < domain.node.length (); ++x) - { - for (y = 0; y < domain.node[x].connectionRef.length (); ++y) - { - ref_value = domain.node[x].connectionRef[y]; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - domain.node[x].connectionRef[y] = orig_value; - } - } - } - - for (y = 0; y < domain.node[x].sharedResourceRef.length (); ++y) - { - ref_value = domain.node[x].sharedResourceRef[y]; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - domain.node[x].sharedResourceRef[y] = orig_value; - } - } - } - - } -} - -void Domain_Handler::update_ic_refs (Deployment::Domain& domain) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < domain.interconnect.length (); ++x) - { - for (y = 0; y < domain.interconnect[x].connectionRef.length (); ++y) - { - ref_value = domain.interconnect[x].connectionRef[y]; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - domain.interconnect[x].connectionRef[y] = orig_value; - } - } - } - - for (y = 0; y < domain.interconnect[x].connectRef.length (); ++y) - { - ref_value = domain.interconnect[x].connectRef[y]; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - domain.interconnect[x].connectRef[y] = orig_value; - } - } - } - } -} - -void Domain_Handler::update_bridge_refs (Deployment::Domain& domain) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < domain.bridge.length (); ++x) - { - for (y = 0; y < domain.bridge[x].connectRef.length (); ++y) - { - ref_value = domain.bridge[x].connectRef[y]; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - domain.bridge[x].connectRef[y] = orig_value; - } - } - } - } -} - -void Domain_Handler::update_sr_refs (Deployment::Domain& domain) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < domain.sharedResource.length (); ++x) - { - for (y = 0; y < domain.sharedResource[x].nodeRef.length (); ++y) - { - ref_value = domain.sharedResource[x].nodeRef[y]; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - domain.sharedResource[x].nodeRef[y] = orig_value; - } - } - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.h deleted file mode 100644 index a29e7cf7fd1..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.h +++ /dev/null @@ -1,127 +0,0 @@ -//================================================================== -/** - * @file Domain_Handler.h - * - * $Id$ - * - * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - */ -//===================================================================== -#ifndef DOMAIN_HANDLER_H -#define DOMAIN_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "Basic_Handler.h" -#include "XercesString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class Domain_Handler - * - * @brief Handler class for <Domain> type - * - * This class is within the Target Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the description files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export Domain_Handler: public Basic_Handler -{ -public: - - /// constructor - Domain_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - Domain_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - Domain_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the Domain type - void process_domain (Deployment::Domain& domain); - - /// process the node attribute - void process_node (DOMNodeIterator* iter, - Deployment::Node& domain_node); - - /// process the node attribute - void process_bridge (DOMNodeIterator* iter, - Deployment::Bridge& domain_bridge); - - /// process the node attribute - void process_interconnect (DOMNodeIterator* iter, - Deployment::Interconnect& domain_ic); - - /// process the resource attribute - void process_resource (DOMNodeIterator* iter, - Deployment::Resource& domain_resource); - - /// process the node attribute - void process_sr (DOMNodeIterator* iter, - Deployment::SharedResource& domain_sr); - - /// update node refs - void update_node_refs (Deployment::Domain& domain); - - /// update ic refs - void update_ic_refs (Deployment::Domain& domain); - - /// update bridge refs - void update_bridge_refs (Deployment::Domain& domain); - - /// update sr refs - void update_sr_refs (Deployment::Domain& domain); - - /// process IDREFs - void process_refs (DOMNamedNodeMap* named_node_map); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* DOMAIN_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp deleted file mode 100644 index 9251ab3adb5..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp +++ /dev/null @@ -1,27 +0,0 @@ -//$Id$ - -#include "ERE_Handler.h" -#include "Utils.h" - -using CIAO::Config_Handler::Utils; - -void -CIAO::Config_Handler::ERE_Handler:: -process_ExternalReferenceEndpoint (DOMNodeIterator * iter, - Deployment::ExternalReferenceEndpoint &ret_struct) -{ - //Check if the Schema IDs for both the elements match - DOMNode * node = iter->nextNode (); - XStr name (node->getNodeName ()); - - if (name != XStr (ACE_TEXT ("location"))) - { - ACE_DEBUG ((LM_DEBUG, - "Config_Handlers::ERE_Handler::process_ExternalRefEndPoint \ - element mismatch expected <location>")); - ACE_THROW (CORBA::INTERNAL ()); - } - - // Populate the structure - ret_struct.location = Utils::parse_string (iter); -} diff --git a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h b/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h deleted file mode 100644 index 3fdafe87009..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h +++ /dev/null @@ -1,63 +0,0 @@ - -//================================================================== -/** - * @file ERE_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef ERE_HANDLER_H -#define ERE_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class ERE_Handler - * - * @brief Handler class for <ExternalReferenceEndpoint> tag - * - * This class defines handler methods to parse the aforementioned type - * in the descriptor files. The corresponding CORBA IDL type for this - * element is returned. - */ - - class Config_Handler_Export ERE_Handler - { - public: - static void - process_ExternalReferenceEndpoint (DOMNodeIterator * iter, - Deployment::ExternalReferenceEndpoint &ret_struct); - // process <ExternalReferenceEndpoint> definitions in the descriptor - // files - - }; - } -} - -#include /**/ "ace/post.h" - -#endif /* ERE_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp deleted file mode 100644 index 9e4ff47cf28..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp +++ /dev/null @@ -1,73 +0,0 @@ -//$Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Property_Handler.h" -#include "Requirement_Handler.h" -#include "NIA_Handler.h" -#include "IAD_Handler.h" -#include "Utils.h" -#include "Process_Element.h" -#include <iostream> - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -void IAD_Handler::process_ImplementationArtifactDescription -(::Deployment::ImplementationArtifactDescription &iad) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ImplementationArtifactDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "label", iad.label)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "UUID", iad.UUID)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (this->iter_, node_name, "location", - iad.location)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "execParameter", iad.execParameter, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_common<Deployment::Requirement> - (node->getOwnerDocument(), this->iter_, node, - node_name, "deployRequirement", iad.deployRequirement, - &Requirement_Handler::process_Requirement, - this->id_map_)); - else if - (process_sequence_remote<Deployment::NamedImplementationArtifact, - NIA_Handler> - (this->doc_, this->iter_, node, - node_name, "dependsOn", iad.dependsOn, - &NIA_Handler::process_NamedImplementationArtifact, this->id_map_)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "infoProperty", iad.infoProperty, - &Property_Handler::process_Property, - this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } - return; -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.h b/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.h deleted file mode 100644 index a46de1d885f..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.h +++ /dev/null @@ -1,99 +0,0 @@ -//================================================================== -/** - * @file IAD_Handler.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef IAD_HANDLER_H -#define IAD_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class IAD_Handler - * - * @brief Handler class for <ImplementationArtifactDescription> tag - * - * This class defines handler methods to parse the - * ImplementationArtifactDescription type - * in the descriptor files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export IAD_Handler: public Basic_Handler -{ -public: - - /// constructor - IAD_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - IAD_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - IAD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the component package description - void process_ImplementationArtifactDescription - (::Deployment::ImplementationArtifactDescription &iad); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* IAD_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/ID_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/ID_Handler.cpp deleted file mode 100644 index 71f700f596e..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/ID_Handler.cpp +++ /dev/null @@ -1,28 +0,0 @@ -//$Id$ - -#include "ID_Handler.h" -#include "tao/Exception.h" -#include "Utils.h" - -using CIAO::Config_Handler::Utils; - -void -CIAO::Config_Handler::ID_Handler:: -process_ImplementationDependency (DOMNodeIterator * iter, - Deployment::ImplementationDependency &ret_struct) -{ - //Check if the Schema IDs for both the elements match - DOMNode * node = iter->nextNode (); - XStr name (node->getNodeName ()); - - if (name != XStr (ACE_TEXT ("elementType"))) - { - ACE_DEBUG ((LM_DEBUG, - "Config_Handlers::ID_Handler::process_ImplDependency \ - element mismatch expected <elementType>")); - ACE_THROW (CORBA::INTERNAL ()); - } - - // Populate the structure - ret_struct.requiredType = Utils::parse_string (iter); -} diff --git a/TAO/CIAO/DnC/Config_Handlers/ID_Handler.h b/TAO/CIAO/DnC/Config_Handlers/ID_Handler.h deleted file mode 100644 index ef7f9c5c86d..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/ID_Handler.h +++ /dev/null @@ -1,64 +0,0 @@ -//================================================================== -/** - * @file ID_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef ID_HANDLER_H -#define ID_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class ID_Handler - * - * @brief Handler class for <ImplementationDependency> type - * - * This class defines handler methods to parse Implementation - * Dependency types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - * KNOWN ISSUE: - * The IDL mapping for this type defines a struct containing a - * string type. However, the schema defines an unbounded string. - * Currently, this Handler handles what the IDL requires as this is - * valid via the schema definition also. - * - */ - class Config_Handler_Export ID_Handler - { - public: - static void - process_ImplementationDependency (DOMNodeIterator * iter, - Deployment::ImplementationDependency &ret_struct); - // process elements of type Implementation Dependency definitions in - // the descriptor files - - }; - } - -} - -#include /**/ "ace/post.h" - -#endif /* ID_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp deleted file mode 100644 index d4255b5555e..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp +++ /dev/null @@ -1,58 +0,0 @@ -//$Id$ -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "IAD_Handler.h" -#include "IR_Handler.h" -#include "RUK_Handler.h" -#include "Utils.h" -#include "Utils.h" -#include "Process_Element.h" -#include "Property_Handler.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -void IR_Handler::process_ImplementationRequirement -(::Deployment::ImplementationRequirement &ir) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ImplementationRequirement"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "resourcePort", - ir.resourcePort)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "componentPort", - ir.componentPort)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "resourceType", - ir.resourceType)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "name", ir.name)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "Property", ir.property, - &Property_Handler::process_Property, - this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.h b/TAO/CIAO/DnC/Config_Handlers/IR_Handler.h deleted file mode 100644 index 9e159ed2636..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.h +++ /dev/null @@ -1,106 +0,0 @@ -//================================================================== -/** - * @file IR_Handler.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef IR_HANDLER_H -#define IR_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" -#include "RUK_Handler.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class IR_Handler - * - * @brief Handler class for <ImplementationRequirement> type - * - * This class defines handler methods to parse Implementation - * Requirement types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - -class Config_Handler_Export IR_Handler: public Basic_Handler -{ -public: - - /// constructor - IR_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - IR_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - IR_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the package configuration - void process_ImplementationRequirement (::Deployment::ImplementationRequirement &ir); - -protected: - /// Process the resourceUsage attribute - void process_resourceUsage (const XMLCh* name, ::Deployment::ImplementationRequirement &ir); - - /// Process the resourcePort attribute - void process_resourcePort (const XMLCh* name, ::Deployment::ImplementationRequirement &ir); - - /// Process the componentPort attribute - void process_componentPort (const XMLCh* name, ::Deployment::ImplementationRequirement &ir); - - /* - * Derived from Requirement - */ - - /// Process the label attribute - void process_name (const XMLCh* name, ::Deployment::ImplementationRequirement &ir); - - /// Process the label attribute - void process_resourceType (const XMLCh* name, ::Deployment::ImplementationRequirement &ir); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* IR_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/MID_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/MID_Handler.cpp deleted file mode 100644 index bce6afd2e7a..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/MID_Handler.cpp +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Property_Handler.h" -#include "Requirement_Handler.h" -#include "NIA_Handler.h" -#include "MID_Handler.h" -#include "IR_Handler.h" -#include "Process_Element.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -void MID_Handler::process_MonolithicImplementationDescription - (::Deployment::MonolithicImplementationDescription &mid) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - if (node_name == XStr - (ACE_TEXT ("Deployment:MonolithicImplementationDescription"))) - { - } - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "execParameter", mid.execParameter, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_remote<Deployment::NamedImplementationArtifact, - NIA_Handler> - (this->doc_, this->iter_, node, - node_name, "primaryArtifact", mid.primaryArtifact, - &NIA_Handler::process_NamedImplementationArtifact, - this->id_map_)); - else if - (process_sequence_remote<Deployment::ImplementationRequirement, - IR_Handler> - (this->doc_, this->iter_, node, - node_name, "deployRequirement", mid.deployRequirement, - &IR_Handler::process_ImplementationRequirement, this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/MID_Handler.h b/TAO/CIAO/DnC/Config_Handlers/MID_Handler.h deleted file mode 100644 index 17c3a2c4a3d..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/MID_Handler.h +++ /dev/null @@ -1,116 +0,0 @@ -// $Id$ - -#ifndef MID_HANDLER_H -#define MID_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class MID_Handler - * - * @brief Handler class for <MonolithicImplementationDescription> type - * - * This class defines handler methods to parse Monolithic Implementation - * Descroption types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - -class Config_Handler_Export MID_Handler: public Basic_Handler -{ -public: - - MID_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - MID_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - MID_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - void process_MonolithicImplementationDescription (::Deployment::MonolithicImplementationDescription &mid); - -protected: - /// process exec parameter element - void process_exec_parameter_element (DOMNode* node, - DOMDocument* doc, DOMNodeIterator* iter, - Deployment::MonolithicImplementationDescription& mid); - - /// process attributes for property element - void process_attributes_for_property (DOMNamedNodeMap* named_node_map, - DOMDocument* doc, - DOMNodeIterator* iter, - int value, - Deployment::Property& ccd_property); - - /// process attributes for deploy requirement - void process_attributes_for_deploy_requirement (DOMNamedNodeMap* nm, - DOMDocument* doc, - DOMNodeIterator* iter, - int value, - Deployment::ImplementationRequirement& req); - - /// process attributes for NIA - void process_attributes_for_nia (DOMNamedNodeMap* nm, - DOMDocument* doc, - DOMNodeIterator* iter, - int value, - Deployment::NamedImplementationArtifact& nia); - - /// process IDREFS - void process_refs (DOMNamedNodeMap* named_node_map); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* MID_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp deleted file mode 100644 index 11db8839207..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp +++ /dev/null @@ -1,44 +0,0 @@ -//$Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "IAD_Handler.h" -#include "NIA_Handler.h" -#include "Utils.h" -#include "Process_Element.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -void NIA_Handler::process_NamedImplementationArtifact -(::Deployment::NamedImplementationArtifact &nia) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - if (node_name == XStr - (ACE_TEXT ("Deployment:NamedImplementationArtifact"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "name", nia.name)); - else if - (process_element_remote<Deployment::ImplementationArtifactDescription, - IAD_Handler> - (this->doc_, this->iter_, node, - node_name, "referencedArtifact", nia.referencedArtifact, - &IAD_Handler::process_ImplementationArtifactDescription, - this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.h b/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.h deleted file mode 100644 index 38ad44beed2..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.h +++ /dev/null @@ -1,84 +0,0 @@ -//================================================================== -/** - * @file NIA_Handler.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef NIA_HANDLER_H -#define NIA_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class NIA_Handler - * - * @brief Handler class for <NamedImplementationArtifact> type - * - * This class defines handler methods to parse Named Implementation - * Artifact types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - -class Config_Handler_Export NIA_Handler: public Basic_Handler -{ -public: - - /// constructor - NIA_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - NIA_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - NIA_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the package configuration - void process_NamedImplementationArtifact (::Deployment::NamedImplementationArtifact &nia); -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* NIA_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp deleted file mode 100644 index e26a73dab27..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "CompImplDesc_Handler.h" -#include "PCI_Handler.h" -#include "Utils.h" -#include "Process_Element.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -void PCI_Handler::process_PackagedComponentImplementation - (::Deployment::PackagedComponentImplementation &pci) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:PackagedComponentImplementation"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "name", pci.name)); - else if - (process_element_remote<Deployment::ComponentImplementationDescription, - CompImplDesc_Handler> - (this->doc_, this->iter_, node, - node_name, "referencedImplementation", - pci.referencedImplementation, - &CompImplDesc_Handler::process_ComponentImplementationDescription, - this->id_map_)); - else - { - this->iter_->previousNode (); - return; - } - } - return; -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.h b/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.h deleted file mode 100644 index 841db0fc0a6..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.h +++ /dev/null @@ -1,87 +0,0 @@ -//================================================================== -/** - * @file PCI_Handler.h - * - * $Id$ - * - * @author George Edwards <g.edwards@vanderbilt.edu> - */ -//===================================================================== - -#ifndef PCI_HANDLER_H -#define PCI_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" -#include "Basic_Handler.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class PCI_Handler - * - * @brief Handler class for <PackagedComponentImplementation> type - * - * This class is within the Component Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the description files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export PCI_Handler: public Basic_Handler -{ -public: - - /// constructor - PCI_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - PCI_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - PCI_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the package configuration - void process_PackagedComponentImplementation (::Deployment::PackagedComponentImplementation &pci); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* PCI_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp deleted file mode 100644 index 25804bd71c3..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Property_Handler.h" -#include "Requirement_Handler.h" -#include "CPR_Handler.h" -#include "CompPkgDesc_Handler.h" -#include "PC_Handler.h" -#include "Process_Element.h" -#include "Utils.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -void PC_Handler::process_PackageConfiguration - (::Deployment::PackageConfiguration &pc) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName()); - if (node_name == XStr - (ACE_TEXT ("Deployment:PackageConfiguration"))) - { - } - else if (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "label", pc.label)) - { - } - else if (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "UUID", pc.UUID)) - { - } - else if (process_sequence_remote - <Deployment::ComponentPackageDescription, - CompPkgDesc_Handler> - (this->doc_, this->iter_, node, - node_name, "basePackage", pc.basePackage, - &CompPkgDesc_Handler::process_ComponentPackageDescription, - this->id_map_)) - { - } - else if (process_sequence_remote - <Deployment::ComponentPackageReference, CPR_Handler> - (this->doc_, this->iter_, node, - node_name, "reference", pc.reference, - &CPR_Handler::process_ComponentPackageReference, - this->id_map_)) - { - } - else if (process_sequence_common - <Deployment::Requirement> - (this->doc_, this->iter_, node, - node_name, "selectRequirement", pc.selectRequirement, - &Requirement_Handler::process_Requirement,this->id_map_)) - { - } - else if (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "configProperty", pc.configProperty, - &Property_Handler::process_Property, this->id_map_)) - { - } - else - { - ACE_THROW (CORBA::INTERNAL()); - } - } - return; -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.h b/TAO/CIAO/DnC/Config_Handlers/PC_Handler.h deleted file mode 100644 index 224f298f0a4..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.h +++ /dev/null @@ -1,91 +0,0 @@ -//================================================================== -/** - * @file PC_Handler.h - * - * $Id$ - * - * @author George Edwards <g.edwards@vanderbilt.edu> - */ -//===================================================================== - -#ifndef PC_HANDLER_H -#define PC_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class PC_Handler - * - * @brief Handler class for <PackageConfiguration> type - * - * This class is within the Component Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the description files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export PC_Handler: public Basic_Handler -{ -public: - - /// constructor - PC_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - PC_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - PC_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the package configuration - void process_PackageConfiguration (::Deployment::PackageConfiguration &pc); - - /// Process the specializedConfig attribute - void process_specializedConfig - (const XMLCh* specializedConfig, ::Deployment::PackageConfiguration &pc); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* PC_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.cpp deleted file mode 100644 index bf4b22c2c3f..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.cpp +++ /dev/null @@ -1,624 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "Plan_Handler.h" -#include "ID_Handler.h" -#include "CompIntrDesc_Handler.h" -#include "Property_Handler.h" -#include "SP_Handler.h" -#include "Requirement_Handler.h" -#include "Any_Handler.h" -#include "RUK_Handler.h" -#include "CEPE_Handler.h" -#include "ERE_Handler.h" -#include "CPK_Handler.h" -#include "Process_Element.h" -#include "Utils.h" -#include <iostream> -#include "string.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the DeploymentPlan type and populate the IDL structure -void Plan_Handler::process_plan(Deployment::DeploymentPlan& plan) -{ - for (DOMNode* node = this->iter_->nextNode(); - node != 0; - node = this->iter_->nextNode()) - { - XStr node_name (node->getNodeName ()); - - - if (node_name == XStr - (ACE_TEXT ("Deployment:DeploymentPlan"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "label", plan.label)); - else if - (CIAO::Config_Handler::Utils::process_string - (this->iter_, node_name, "UUID", plan.UUID)); - else if - (process_element<Deployment::ComponentInterfaceDescription> - (this->doc_, this->iter_, node, - node_name, "realizes", plan.realizes, - this, &Plan_Handler::process_ccd, - this->id_map_)); - else if - (process_sequence_local<Deployment::MonolithicDeploymentDescription> - (this->doc_, this->iter_, node, - node_name, "implementation", plan.implementation, - this, &Plan_Handler::process_mdd)); - else if - (process_sequence_local<Deployment::InstanceDeploymentDescription> - (this->doc_, this->iter_, node, - node_name, "instance", plan.instance, - this, &Plan_Handler::process_idd)); - else if - (process_sequence_local<Deployment::PlanConnectionDescription> - (this->doc_, this->iter_, node, - node_name, "connection", plan.connection, - this, &Plan_Handler::process_pcd)); - else if - (process_sequence_local<Deployment::PlanPropertyMapping> - (this->doc_, this->iter_, node, - node_name, "externalProperty", plan.externalProperty, - this, &Plan_Handler::process_ppm)); - else if - (process_sequence_common<Deployment::ImplementationDependency> - (this->doc_, this->iter_, node, - node_name, "dependsOn", plan.dependsOn, - &ID_Handler::process_ImplementationDependency, this->id_map_)); - else if - (process_sequence_local<Deployment::ArtifactDeploymentDescription> - (this->doc_, this->iter_, node, - node_name, "artifact", plan.artifact, - this, &Plan_Handler::process_add)); - else if - (process_sequence_common<Deployment::Property> - (this->doc_, this->iter_, node, - node_name, "infoProperty", plan.infoProperty, - &Property_Handler::process_Property, - this->id_map_)); - else - { - // ??? How did we get here ??? - ACE_THROW (CORBA::INTERNAL()); - } - } - - this->update_mdd_refs (plan); - this->update_idd_refs (plan); - this->update_pspe_refs (plan); - this->update_pspr_refs (plan); - return; -} - -void Plan_Handler::process_rdd (DOMNodeIterator* iter, - Deployment:: - ResourceDeploymentDescription& rdd) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ResourceDeploymentDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "requirementName", - rdd.requirementName)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "resourceName", rdd.resourceName)); - else if (node_name == XStr (ACE_TEXT ("resourceValue"))) - { - Any_Handler::process_Any (iter, rdd.resourceValue); - } - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_irdd (DOMNodeIterator* iter, - Deployment:: - InstanceResourceDeploymentDescription &irdd) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:InstanceResourceDeploymentDescription"))) - { - } - else if (node_name == "resourceUsage") - { - RUK_Handler::process_ResourceUsageKind (iter, irdd.resourceUsage); - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "requirementName", - irdd.requirementName)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "resourceName", irdd.resourceName)); - else if (node_name == XStr (ACE_TEXT ("resourceValue"))) - { - Any_Handler::process_Any (iter, irdd.resourceValue); - } - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_add (DOMNodeIterator* iter, - Deployment::ArtifactDeploymentDescription& add) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ArtifactDeploymentDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", add.name)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "location", add.location)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "node", add.node)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "source", add.source)); - else if - (process_sequence_common<Deployment::Property> - (node->getOwnerDocument(), iter, node, - node_name, "execParameter", add.execParameter, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_common<Deployment::Requirement> - (node->getOwnerDocument(), iter, node, - node_name, "deployRequirement", add.deployRequirement, - &Requirement_Handler::process_Requirement, - this->id_map_)); - else if - (process_sequence_local<Deployment::ResourceDeploymentDescription> - (node->getOwnerDocument(), iter, node, - node_name, "deployedResource", add.deployedResource, - this, &Plan_Handler::process_rdd)); - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_idd (DOMNodeIterator* iter, - Deployment::InstanceDeploymentDescription& idd) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:InstanceDeploymentDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", idd.name)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "node", idd.node)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "source", idd.source)); - else if - (process_reference (node, node_name, "implementation", - idd.implementationRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else if - (process_sequence_common<Deployment::Property> - (node->getOwnerDocument(), iter, node, - node_name, "configProperty", idd.configProperty, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_local<Deployment:: - InstanceResourceDeploymentDescription> - (node->getOwnerDocument(), iter, node, - node_name, "deployedResource", idd.deployedResource, - this, &Plan_Handler::process_irdd)); - else if - (process_sequence_local<Deployment:: - InstanceResourceDeploymentDescription> - (node->getOwnerDocument(), iter, node, - node_name, "deployedSharedResource", idd.deployedSharedResource, - this, &Plan_Handler::process_irdd)); - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_mdd (DOMNodeIterator* iter, - Deployment::MonolithicDeploymentDescription& - mdd) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:MonolithicDeploymentDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", mdd.name)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "source", mdd.source)); - else if - (process_reference_seq (node, node_name, "artifact", - mdd.artifactRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else if - (process_sequence_common<Deployment::Property> - (node->getOwnerDocument(), this->iter_, node, - node_name, "execParameter", mdd.execParameter, - &Property_Handler::process_Property, - this->id_map_)); - else if - (process_sequence_common<Deployment::Requirement> - (node->getOwnerDocument(), this->iter_, node, - node_name, "deployRequirement", mdd.deployRequirement, - &Requirement_Handler::process_Requirement, - this->id_map_)); - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_ccd (DOMNodeIterator* iter, - Deployment::ComponentInterfaceDescription& - cid) -{ - CompIntrDesc_Handler handler (iter, false); - handler.process_ComponentInterfaceDescription (cid); -} - -void Plan_Handler::process_pspr (DOMNodeIterator* iter, - Deployment::PlanSubcomponentPropertyReference& pspr) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:PlanSubcomponentPropertyReference"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "propertyName", pspr.propertyName)); - else if - (process_reference (node, node_name, "instance", pspr.instanceRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_pspe (DOMNodeIterator* iter, - Deployment::PlanSubcomponentPortEndpoint& pspe) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:PlanSubcomponentPortEndpoint"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "portName", pspe.portName)); - else if - (CIAO::Config_Handler::Utils::process_boolean - (iter, node_name, "provider", pspe.provider)); - else if (node_name == XStr (ACE_TEXT ("kind"))) - { - CPK_Handler::process_CCMComponentPortKind (iter, pspe.kind); - } - else if - (process_reference (node, node_name, "instance", - pspe.instanceRef, - this->index_, this->idref_map_)) - { - this->index_ = this->index_ + 1; - } - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_ppm(DOMNodeIterator* iter, - Deployment::PlanPropertyMapping& ppm) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:PlanPropertyMapping"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", ppm.name)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "source", ppm.source)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "externalName", ppm.externalName)); - else if - (process_sequence_local<Deployment::PlanSubcomponentPropertyReference> - (node->getOwnerDocument(), iter, node, - node_name, "delegatesTo", ppm.delegatesTo, - this, &Plan_Handler::process_pspr)); - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_crdd (DOMNodeIterator* iter, - Deployment:: - ConnectionResourceDeploymentDescription& crdd) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:ConnectionResourceDeploymentDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "targetName", crdd.targetName)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "requirementName", - crdd.requirementName)); - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "resourceName", crdd.resourceName)); - else if (node_name == XStr (ACE_TEXT ("resourceValue"))) - { - Any_Handler::process_Any (iter, crdd.resourceValue); - } - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::process_pcd (DOMNodeIterator* iter, - Deployment::PlanConnectionDescription& pcd) -{ - for (DOMNode* node = iter->nextNode(); - node != 0; - node = iter->nextNode ()) - { - XStr node_name (node->getNodeName()); - - if (node_name == XStr - (ACE_TEXT ("Deployment:PlanConnectionDescription"))) - { - } - else if - (CIAO::Config_Handler::Utils::process_string - (iter, node_name, "name", pcd.name)); - else if - (CIAO::Config_Handler::Utils::process_string_seq - (iter, node_name, "source", pcd.source)); - else if - (process_sequence_common<Deployment::Requirement> - (node->getOwnerDocument(), this->iter_, node, - node_name, "deployRequirement", pcd.deployRequirement, - &Requirement_Handler::process_Requirement, - this->id_map_)); - else if - (process_sequence_common<Deployment::ComponentExternalPortEndpoint> - (node->getOwnerDocument(), iter, node, - node_name, "externalEndpoint", pcd.externalEndpoint, - &CEPE_Handler::process_ComponentExternalPortEndpoint, - this->id_map_)); - else if - (process_sequence_local<Deployment::PlanSubcomponentPortEndpoint> - (node->getOwnerDocument(), iter, node, - node_name, "internalEndpoint", pcd.internalEndpoint, - this, &Plan_Handler::process_pspe)); - else if - (process_sequence_common<Deployment::ExternalReferenceEndpoint> - (node->getOwnerDocument(), iter, node, - node_name, "externalReference", pcd.externalReference, - &ERE_Handler::process_ExternalReferenceEndpoint, - this->id_map_)); - else if - (process_sequence_local<Deployment:: - ConnectionResourceDeploymentDescription> - (node->getOwnerDocument(), iter, node, - node_name, "deployedResource", pcd.deployedResource, - this, &Plan_Handler::process_crdd)); - else - { - iter->previousNode(); - return; - } - } -} - -void Plan_Handler::update_mdd_refs (Deployment::DeploymentPlan& plan) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < plan.implementation.length (); ++x) - { - for (y = 0; y < plan.implementation[x].artifactRef.length (); ++y) - { - ref_value = plan.implementation[x].artifactRef[y]; - //ACE_DEBUG ((LM_DEBUG, "ref_value in ADD is %d \n", ref_value)); - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - plan.implementation[x].artifactRef[y] = orig_value; - } - } - } - } -} - -void Plan_Handler::update_idd_refs (Deployment::DeploymentPlan& plan) -{ - CORBA::ULong x; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < plan.instance.length (); ++x) - { - ref_value = plan.instance[x].implementationRef; - //ACE_DEBUG ((LM_DEBUG, "ref_value in MDD is %d \n", ref_value)); - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - plan.instance[x].implementationRef = orig_value; - } - } - } -} - -void Plan_Handler::update_pspe_refs (Deployment::DeploymentPlan& plan) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < plan.connection.length (); ++x) - { - for (y = 0; y < plan.connection[x].internalEndpoint.length (); ++y) - { - ref_value = plan.connection[x].internalEndpoint[y]. - instanceRef; - //ACE_DEBUG ((LM_DEBUG, "ref_value in IDD is %d \n", ref_value)); - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - plan.connection[x].internalEndpoint[y]. - instanceRef = orig_value; - } - } - } - } -} - -void Plan_Handler::update_pspr_refs (Deployment::DeploymentPlan& plan) -{ - CORBA::ULong x; - CORBA::ULong y; - int ref_value; - int orig_value; - ACE_TString ref_name; - - for (x = 0; x < plan.externalProperty.length (); ++x) - { - for (y = 0; y < plan.externalProperty[x].delegatesTo.length (); ++y) - { - ref_value = plan.externalProperty[x].delegatesTo[y]. - instanceRef; - if (idref_map_.find (ref_value, ref_name) == 0) - { - if (id_map_.find (ref_name, orig_value) == 0) - { - plan.externalProperty[x].delegatesTo[y]. - instanceRef = orig_value; - } - } - } - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.h deleted file mode 100644 index 3983e4f1faf..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.h +++ /dev/null @@ -1,251 +0,0 @@ -//================================================================== -/** - * @file Plan_Handler.h - * - * $Id$ - * - * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - */ -//===================================================================== -#ifndef PLAN_HANDLER_H -#define PLAN_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Basic_Handler.h" -#include "Config_Handler_export.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class Plan_Handler - * - * @brief Handler class for <DeploymentPlan> type - * - */ - -class Config_Handler_Export Plan_Handler: public Basic_Handler -{ -public: - - /// constructor - Plan_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - Plan_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - Plan_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the plan type - void process_plan (Deployment::DeploymentPlan& plan); - - /// process cid - void process_ccd (DOMNodeIterator* iter, - Deployment::ComponentInterfaceDescription& cid); - - /// process pspr - void process_pspr (DOMNodeIterator* iter, - Deployment::PlanSubcomponentPropertyReference& pspr); - - /// process pspe - void process_pspe (DOMNodeIterator* iter, - Deployment::PlanSubcomponentPortEndpoint& pspe); - - /// process add - void process_add (DOMNodeIterator* iter, - Deployment::ArtifactDeploymentDescription& add); - - /// process con - void process_pcd (DOMNodeIterator* iter, - Deployment::PlanConnectionDescription& con); - - /// process external property - void process_ppm (DOMNodeIterator* iter, - Deployment::PlanPropertyMapping& ppm); - - /// process idd - void process_idd (DOMNodeIterator* iter, - Deployment::InstanceDeploymentDescription& idd); - - /// process mdd - void process_mdd (DOMNodeIterator* iter, - Deployment::MonolithicDeploymentDescription& mdd); - - /// process rdd - void process_rdd (DOMNodeIterator* iter, - Deployment::ResourceDeploymentDescription& rdd); - - /// process crdd - void process_crdd (DOMNodeIterator* iter, - Deployment::ConnectionResourceDeploymentDescription& crdd); - /// process irdd - void process_irdd (DOMNodeIterator* iter, - Deployment::InstanceResourceDeploymentDescription &irdd); - - /// process the add name - void process_add_name (const XMLCh* name, - Deployment::ArtifactDeploymentDescription& add); - - /// process the pspr property name - void process_pspr_prop_name (const XMLCh* name, - Deployment::PlanSubcomponentPropertyReference& pspr); - - /// process the pspe port name - void process_pspe_port_name (const XMLCh* name, - Deployment::PlanSubcomponentPortEndpoint& pspe); - - /// process the pspe provider - void process_pspe_provider (const XMLCh* value, - Deployment::PlanSubcomponentPortEndpoint& pspe); - - /// process the idd name - void process_idd_name (const XMLCh* name, - Deployment::InstanceDeploymentDescription& idd); - - /// process the ppm name - void process_ppm_name (const XMLCh* name, - Deployment::PlanPropertyMapping& ppm); - - /// process the ppm external name - void process_ppm_ext_name (const XMLCh* name, - Deployment::PlanPropertyMapping& ppm); - - /// process the idd node - void process_idd_node (const XMLCh* node, - Deployment::InstanceDeploymentDescription& idd); - - /// process the idd source - void process_idd_source (const XMLCh* source, - Deployment::InstanceDeploymentDescription& idd); - - /// process the add location - void process_add_location (const XMLCh* location, - Deployment::ArtifactDeploymentDescription& add); - - /// process the add source - void process_add_source (const XMLCh* source, - Deployment::ArtifactDeploymentDescription& add); - - /// process the add node - void process_add_node (const XMLCh* node, - Deployment::ArtifactDeploymentDescription& add); - - /// process the mdd source - void process_mdd_source (const XMLCh* source, - Deployment::MonolithicDeploymentDescription& mdd); - - /// process the ppm source - void process_ppm_source (const XMLCh* source, - Deployment::PlanPropertyMapping& ppm); - - /// process the pcd source - void process_pcd_source (const XMLCh* source, - Deployment::PlanConnectionDescription& pcd); - - /// process the pcd name - void process_pcd_name (const XMLCh* name, - Deployment::PlanConnectionDescription& pcd); - - /// process the add node - void process_mdd_name (const XMLCh* name, - Deployment::MonolithicDeploymentDescription& mdd); - - /// process the rdd req name - void process_rdd_req_name (const XMLCh* name, - Deployment::ResourceDeploymentDescription& rdd); - - /// process the rdd res name - void process_rdd_res_name (const XMLCh* name, - Deployment::ResourceDeploymentDescription& rdd); - - /// process the irdd res name - void process_irdd_res_name (const XMLCh* name, - Deployment::InstanceResourceDeploymentDescription &irdd); - - /// process the crdd res name - void process_crdd_res_name (const XMLCh* name, - Deployment::ConnectionResourceDeploymentDescription& crdd); - - /// process the crdd req name - void process_crdd_req_name (const XMLCh* name, - Deployment::ConnectionResourceDeploymentDescription& crdd); - - /// process the crdd target name - void process_crdd_target_name (const XMLCh* name, - Deployment::ConnectionResourceDeploymentDescription& crdd); - - /// process the irdd req name - void process_irdd_req_name (const XMLCh* name, - Deployment::InstanceResourceDeploymentDescription &irdd); - - /// process the irdd res usage - void process_irdd_res_usage (const XMLCh* name, - Deployment::InstanceResourceDeploymentDescription &irdd); - - /// process references - void process_refs (DOMNamedNodeMap* named_node_map); - - /// update mdd refs - void update_mdd_refs (Deployment::DeploymentPlan& plan); - - /// update idd refs - void update_idd_refs (Deployment::DeploymentPlan& plan); - - /// update pspe refs - void update_pspe_refs (Deployment::DeploymentPlan& plan); - - /// update pspr refs - void update_pspr_refs (Deployment::DeploymentPlan& plan); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* PLAN_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Process_Element.cpp b/TAO/CIAO/DnC/Config_Handlers/Process_Element.cpp deleted file mode 100644 index 9bfb99b7cb2..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Process_Element.cpp +++ /dev/null @@ -1,121 +0,0 @@ -//================================================================== -/** - * @file Process_Element.cpp - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//===================================================================== - -#include "Process_Element.h" -#include "ace/Auto_Ptr.h" -#include "Utils.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/* - * Process references - */ - -void -process_refs(DOMNode*& node, - CORBA::ULongSeq& seq, - int& index, - IDREF_MAP& idref_map) -{ - CORBA::ULong i (seq.length ()); - seq.length (i + 1); - seq[i] = index; - if (node->hasAttributes()) - { - DOMNamedNodeMap* named_node_map = node->getAttributes (); - //auto_ptr<DOMNamedNodeMap> cleanup_nodemap (named_node_map); - - int length = named_node_map->getLength (); - - for (int j = 0; j < length; j++) - { - DOMNode* attribute_node = named_node_map->item (j); - XStr strattrnodename (attribute_node->getNodeName ()); - char* aceattrnodevalue_ch = XMLString::transcode - (attribute_node->getNodeValue ()); - ACE_TString aceattrnodevalue = aceattrnodevalue_ch; - XMLString::release (&aceattrnodevalue_ch); - if (strattrnodename == XStr (ACE_TEXT ("xmi:idref"))) - { - //index = index + 1; - idref_map.bind (index, aceattrnodevalue); - } - } - } -} - -void -process_ref(DOMNode*& node, - CORBA::ULong& ref, - int& index, - IDREF_MAP& idref_map) -{ - ref = index; - if (node->hasAttributes ()) - { - DOMNamedNodeMap* named_node_map = node->getAttributes (); - //auto_ptr<DOMNamedNodeMap> cleanup_nodemap (named_node_map); - - int length = named_node_map->getLength (); - - for (int j = 0; j < length; j++) - { - DOMNode* attribute_node = named_node_map->item (j); - XStr strattrnodename (attribute_node->getNodeName ()); - char* aceattrnodevalue_ch = XMLString::transcode - (attribute_node->getNodeValue ()); - ACE_TString aceattrnodevalue = aceattrnodevalue_ch; - XMLString::release (&aceattrnodevalue_ch); - if (strattrnodename == XStr (ACE_TEXT ("xmi:idref"))) - { - //index = index + 1; - idref_map.bind (index, aceattrnodevalue); - } - } - } -} - -/* - * Process function for references - */ - -bool -process_reference_seq (DOMNode* node, - XStr& node_name, const char* name, - CORBA::ULongSeq& seq, - int& index, - IDREF_MAP& idref_map) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - process_refs (node, seq, index, idref_map); - - return result; -} - -// Process reference -bool -process_reference (DOMNode* node, - XStr& node_name, const char* name, - CORBA::ULong& ref, - int& index, - IDREF_MAP& idref_map) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - process_ref (node, ref, index, idref_map); - - return result; -} - - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/Process_Element.h b/TAO/CIAO/DnC/Config_Handlers/Process_Element.h deleted file mode 100644 index c60c1e14b75..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Process_Element.h +++ /dev/null @@ -1,192 +0,0 @@ -//================================================================== -/** - * @file Process_Element.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - * Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef PROCESS_ELEMENT_H -#define PROCESS_ELEMENT_H - -#include "DeploymentC.h" -#include "Deployment.h" -#include "Basic_Handler.h" -#include "Config_Handler_export.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMInputSource; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::DOMNamedNodeMap; - -BEGIN_DEPLOYMENT_NAMESPACE - -// ID map type definition -typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP; -typedef ACE_Hash_Map_Iterator<ACE_TString, int, ACE_Null_Mutex> REF_ITER; -typedef ACE_Hash_Map_Manager<int, ACE_TString, ACE_Null_Mutex> IDREF_MAP; - -template <typename DATA> -class Process_Function -{ -public: - virtual void call(DOMDocument*, DOMNodeIterator*, DATA&)=0; - - void operator() (DOMDocument* doc, DOMNodeIterator* iter, DATA& data) - { - call(doc, iter, data); - } -}; - -/* - * Wrapper class for the process member functions. - */ - -template <typename OBJ, typename DATA> -class Process_Member_Function: public Process_Function<DATA> -{ -public: - typedef void (OBJ::*func_type) (DOMNodeIterator*, DATA&); - typedef DATA data_type; - - Process_Member_Function(OBJ& obj, func_type f) - : obj_(&obj), f_(f) - { - } - - Process_Member_Function(OBJ* obj, func_type f) - : obj_(obj), f_(f) - { - } - - virtual void call(DOMDocument* doc, DOMNodeIterator* iter, DATA& data) - { - obj_->set_doc (doc); - obj_->set_iter (iter); - (obj_->*f_) (iter, data); - } - -private: - OBJ* obj_; - func_type f_; -}; - -/* - * Wrapper class for the process member functions which does not have - DOMNodeIterator parameter - */ - -template <typename OBJ, typename DATA> -class Process_Member_Function_Remote: public Process_Function<DATA> -{ -public: - typedef void (OBJ::*func_type) (DATA&); - typedef DATA data_type; - - Process_Member_Function_Remote(OBJ& obj, func_type f) - : obj_(&obj), f_(f) - { - } - - Process_Member_Function_Remote(OBJ* obj, func_type f) - : obj_(obj), f_(f) - { - } - - virtual void call(DOMDocument* doc, DOMNodeIterator* iter, DATA& data) - { - obj_->set_iter(iter); - obj_->set_doc(doc); - (obj_->*f_) (data); - } - -private: - OBJ* obj_; - func_type f_; -}; - -/* - * Wrapper class for the static process member functions. - */ - -template <typename DATA> -class Process_Static_Function: public Process_Function<DATA> -{ -public: - typedef void (*func_type) (DOMNodeIterator*, DATA&); - typedef DATA data_type; - - Process_Static_Function(func_type f) - : f_(f) - { - } - - virtual void call(DOMDocument*, DOMNodeIterator* iter, DATA& data) - { - (*f_) (iter, data); - } - -private: - func_type f_; -}; - -// Processes reference sequences -bool -process_reference_seq (DOMNode* node, - XStr& node_name, const char* name, - CORBA::ULongSeq& seq, - int& index, - IDREF_MAP& idref_map); - -// Process reference -bool -process_reference (DOMNode* node, - XStr& node_name, const char* name, - CORBA::ULong& ref, - int& index, - IDREF_MAP& idref_map); - -END_DEPLOYMENT_NAMESPACE - -#include "Process_Element_T.h" - -#endif // PROCESS_ELEMENT_H diff --git a/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.cpp b/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.cpp deleted file mode 100644 index 56d0f530315..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.cpp +++ /dev/null @@ -1,294 +0,0 @@ -//===================================================================== -/** - * @file Process_Element_T.cpp - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - * Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - */ -//===================================================================== - -#include "Process_Element_T.h" -#include "Config_Handlers/Config_Error_Handler.h" -#include "ace/Auto_Ptr.h" -#include "Utils.h" -#include <iostream> -#include <memory> - -BEGIN_DEPLOYMENT_NAMESPACE - -class parser_error { }; - -template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION> -bool -process_sequence_local(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char* name, - SEQUENCE& seq, OBJECT* obj, FUNCTION func) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - Process_Member_Function<OBJECT, DATA> - pf(obj, func); - process_sequential_element (node, doc, iter, seq, &pf, obj->id_map()); - } - - return result; -} - -template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION> -bool -process_sequence_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* -node, - XStr& node_name, const char* name, - SEQUENCE& seq, FUNCTION func, - REF_MAP& id_map) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - OBJECT obj (doc, iter, false); - - Process_Member_Function_Remote<OBJECT, DATA> - pf(obj, func); - process_sequential_element (node, doc, iter, seq, &pf, id_map); - } - - return result; -} - -template<typename DATA, typename SEQUENCE, typename FUNCTION> -bool -process_sequence_common(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* -node, - XStr& node_name, const char* name, - SEQUENCE& seq, FUNCTION func, - REF_MAP& id_map) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - Process_Static_Function<DATA> - pf(func); - process_sequential_element (node, doc, iter, seq, &pf, id_map); - } - - return result; -} - -template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION> -bool -process_element(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char* name, - ELEMENT& elem, OBJECT* obj, FUNCTION func, - REF_MAP& id_map) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - if (node->hasAttributes ()) - { - DOMNamedNodeMap* named_node_map = node->getAttributes (); - int length = named_node_map->getLength (); - - Process_Member_Function<OBJECT, DATA> - pf(obj, func); - - if (length == 1) - pf(doc, iter, elem); - else - process_element_attributes(named_node_map, doc, iter, 0, elem, -&pf, id_map); - } - } - - return result; -} - -template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION> -bool -process_element_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char *name, - ELEMENT& elem, FUNCTION func, - REF_MAP& id_map) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - OBJECT obj (iter, false); - - if (node->hasAttributes ()) - { - DOMNamedNodeMap* named_node_map = node->getAttributes (); - int length = named_node_map->getLength (); - - Process_Member_Function_Remote<OBJECT, DATA> - pf(&obj, func); - - if (length == 1) - pf(doc, iter, elem); - else - process_element_attributes(named_node_map, doc, iter, 0, elem, -&pf, id_map); - } - } - - return result; -} - -template <typename VALUE, typename DATA> -void process_element_attributes(DOMNamedNodeMap* named_node_map, - DOMDocument* doc, - DOMNodeIterator* iter, - VALUE value, - DATA& data, - Process_Function <DATA>* func, - REF_MAP& id_map) -{ - char* final_url_ch; - try - { - // the number of attributes - int length = named_node_map->getLength(); - // iterate the attributes - for (int j = 0; j < length; ++j) - { - DOMNode* attribute_node = named_node_map->item (j); - XStr strattrnodename (attribute_node->getNodeName ()); - char* aceattrnodevalue_ch = - XMLString::transcode (attribute_node->getNodeValue ()); - ACE_TString aceattrnodevalue = aceattrnodevalue_ch; - XMLString::release (&aceattrnodevalue_ch); - - // if xmi::id is given process the element and bind the value - if (strattrnodename == XStr (ACE_TEXT ("xmi:id"))) - { - (*func) (doc, iter, data); - id_map.bind (aceattrnodevalue, value); - } - // if href is given find out the referenced position - // and process the element - else if (strattrnodename == XStr (ACE_TEXT ("href"))) - { - XMLURL xml_url (aceattrnodevalue.c_str ()); - XMLURL result (aceattrnodevalue.c_str ()); - std::string url_string = aceattrnodevalue.c_str (); - char* doc_path_ch = - XMLString::transcode ( doc->getDocumentURI ()); - ACE_TString doc_path = doc_path_ch; - XMLString::release (&doc_path_ch); - XMLCh* rel_str = - (XMLString::transcode (doc_path.c_str ())); - result.makeRelativeTo - (rel_str); - final_url_ch = - XMLString::transcode (result.getURLText ()); - ACE_TString final_url = final_url_ch; - XMLString::release (&final_url_ch); - XMLString::release (&rel_str); - - DOMDocument* href_doc; - - std::auto_ptr<DOMBuilder> parser ( - CIAO::Config_Handler::Utils::create_parser ()); - - CIAO::Config_Handler::Config_Error_Handler handler; - parser->setErrorHandler(&handler); - - if (xml_url.isRelative ()) - { - href_doc = parser->parseURI (final_url.c_str ()); - if (handler.getErrors ()) - { - ACE_DEBUG ((LM_DEBUG, "XML descriptor error\n")); - //throw parser_error (); - throw DOMException (); - } - } - else - { - href_doc = parser->parseURI (url_string.c_str ()); - if (handler.getErrors ()) - { - ACE_DEBUG ((LM_DEBUG, "XML descriptor error\n")); - //throw parser_error (); - throw DOMException (); - } - } - - DOMDocumentTraversal* traverse = href_doc; - DOMNode* root = (href_doc->getDocumentElement ()); - unsigned long filter = DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT; - DOMNodeIterator* href_iter = traverse->createNodeIterator - (root, - filter, - 0, - true); - href_iter->nextNode (); - (*func) (href_doc, href_iter, data); - } - } - } - catch (const DOMException& e) - { - const unsigned int maxChars = 2047; - XMLCh errText[maxChars + 1]; - - ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \ - \n",final_url_ch)); - ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code)); - if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars)) - { - char* message = XMLString::transcode (errText); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_ERROR ((LM_ERROR, "Message is: %s\n", message)); - } - ACE_ERROR ((LM_ERROR, "Caught DOM exception\n\n")); - return; - } - catch (...) - { - ACE_DEBUG ((LM_DEBUG, "Caught unknown exception\n\n")); - return; - } -} - -template <typename SEQUENCE, typename DATA> -void -process_sequential_element (DOMNode* node, - DOMDocument* doc, - DOMNodeIterator* iter, - SEQUENCE& seq, - Process_Function <DATA>* func, - REF_MAP& id_map) -{ - if (node->hasAttributes ()) - { - // the size of the sequence - CORBA::ULong i = seq.length (); - - // add 1 to the size of the sequence - seq.length (i + 1); - - // fetch attributes - DOMNamedNodeMap* named_node_map = node->getAttributes (); - - // the number of attributes the element have - int length = named_node_map->getLength(); - // if there is no other attribute but 'version' - - if (length == 1) // call directly the static process_ method - (*func) (doc, iter, seq[i]); - else // Check the xmi::id & href attributes - process_element_attributes(named_node_map, doc, iter, i, seq[i], func, id_map); - } -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.h b/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.h deleted file mode 100644 index 693f0338a47..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.h +++ /dev/null @@ -1,90 +0,0 @@ -//================================================================== -/** - * @file Process_Element_T.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - * Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef PROCESS_ELEMENT_T_H -#define PROCESS_ELEMENT_T_H - -#include "Process_Element.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -BEGIN_DEPLOYMENT_NAMESPACE - -// processes sequence - not for common elements, process function is a -// member of "this" - -template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION> -bool -process_sequence_local(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char* name, - SEQUENCE& seq, OBJECT* obj, FUNCTION func); - -// processes sequence - not for common elements, process function is not a -// member of "this" - -template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION> -bool -process_sequence_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char* name, - SEQUENCE& seq, FUNCTION func, - REF_MAP& id_map); - -// Processes sequence - common elements - -template<typename DATA, typename SEQUENCE, typename FUNCTION> -bool -process_sequence_common(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char* name, - SEQUENCE& seq, FUNCTION func, - REF_MAP& id_map); - -// Process function for non-sequential elements -template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION> -bool -process_element(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char* name, - ELEMENT& elem, OBJECT* obj, FUNCTION func, - REF_MAP& id_map); - -// Process function for non-sequential non-local elements -template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION> -bool -process_element_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node, - XStr& node_name, const char* name, - ELEMENT& elem, OBJECT* obj, FUNCTION func, - REF_MAP& id_map); - -template <typename SEQUENCE, typename DATA> -void -process_sequential_element (DOMNode* node, - DOMDocument* doc, - DOMNodeIterator* iter, - SEQUENCE& seq, - Process_Function <DATA>* func, - REF_MAP& id_map); - -template <typename VALUE, typename DATA> -void process_element_attributes (DOMNamedNodeMap* named_node_map, - DOMDocument* doc, DOMNodeIterator* iter, - VALUE value, DATA& data, - Process_Function <DATA>* func, - REF_MAP& id_map); - -END_DEPLOYMENT_NAMESPACE - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Process_Element_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Process_Element_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif // PROCESS_ELEMENT_H diff --git a/TAO/CIAO/DnC/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Property_Handler.cpp deleted file mode 100644 index 1272ad9dcc6..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Property_Handler.cpp +++ /dev/null @@ -1,81 +0,0 @@ -//$Id$ - -#include "Property_Handler.h" -#include "Any_Handler.h" -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "Utils.h" - -using CIAO::Config_Handler::Utils; -using CIAO::Config_Handler::Any_Handler; - -void -CIAO::Config_Handler::Property_Handler::process_Property (DOMNodeIterator * iter, - Deployment::Property &property) -{ - int valid_name = 0, valid_value = 0; - for (DOMNode * node = iter->nextNode (); node != 0; node = iter->nextNode ()) - { - //Check if the Schema IDs for both the elements match - XStr name (node->getNodeName ()); - if (name == XStr (ACE_TEXT ("name"))) - { - valid_name = 1; - property.name = Utils::parse_string (iter); - } - else if (name == XStr (ACE_TEXT ("value"))) - { - valid_value = 1; - if (node->hasAttributes ()) - { - xercesc::DOMNamedNodeMap * named_node_map = - node->getAttributes (); - int length = named_node_map->getLength (); - if (length > 1) - { - for (int j = 0; j < length; j++) - { - DOMNode * attr_node = named_node_map->item (j); - XStr attr_node_name = attr_node->getNodeName (); - char* attr_node_value_ch = - XMLString::transcode (attr_node->getNodeValue ()); - ACE_TString attr_node_value = attr_node_value_ch; - XMLString::release (&attr_node_value_ch); - if (attr_node_name = XStr (ACE_TEXT ("href"))) - { - XMLURL url (attr_node_value.c_str ()); - DOMNodeIterator * value_iter = - Utils::parse_href_tag (url, - node->getOwnerDocument ()); - // Get to the root-node - value_iter->nextNode (); - - // Process the value node present there - Any_Handler::process_Any (value_iter, - property.value); - } - } - } - else if (length == 1) - Any_Handler::process_Any (iter, property.value); - } - else - // Process the value associated - Any_Handler::process_Any (iter, property.value); - } - else - { - if (! valid_name || ! valid_value) - { - ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Property_Handler::\ - process_Property element mismatch expected <name> \ - or <value>")); - ACE_THROW (CORBA::INTERNAL ()); - } - - // Processed one element more go back one and exit - iter->previousNode (); - break; - } - }/* End Outer for */ -} diff --git a/TAO/CIAO/DnC/Config_Handlers/Property_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Property_Handler.h deleted file mode 100644 index 3367a2e1348..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Property_Handler.h +++ /dev/null @@ -1,57 +0,0 @@ -//================================================================== -/** - * @file Property_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//=================================================================== - -#ifndef PROPERTY_HANDLER_H -#define PROPERTY_HANDLER_H - -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class Property_Handler - * - * @brief Handler class for <Property> type - * - * This class defines handler methods to parse Property - * types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - class Config_Handler_Export Property_Handler - { - public: - static void process_Property (DOMNodeIterator * iter, - Deployment::Property &property); - // process elements of type Property definitions in - // the descriptor files - - }; - } -} - -#include /**/ "ace/post.h" - -#endif /* PROPERTY_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/RS_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/RS_Handler.cpp deleted file mode 100644 index f27f02c2d7b..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/RS_Handler.cpp +++ /dev/null @@ -1,128 +0,0 @@ -//$Id$ - -#include "RS_Handler.h" -#include "SP_Handler.h" -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "Utils.h" - -void -CIAO::Config_Handler::RS_Handler:: -process_RequirementSatisfier (DOMNodeIterator * iter, - Deployment::RequirementSatisfier &ret_struct) -{ - // boolean to represent valid <RequirementSatisfier> definition - int valid_name = 0, valid_resourceType = 0, valid_property = 0; - - for (DOMNode * node = iter->nextNode (); ; node = iter->nextNode ()) - { - XStr name (node->getNodeName ()); - if (name == XStr (ACE_TEXT ("name"))) - { - ret_struct.name = CIAO::Config_Handler::Utils::parse_string (iter); - valid_name = 1; - } - else if (name == XStr (ACE_TEXT ("resourceType"))) - { - valid_resourceType = 1; - // Requirement: Atleast one <resourceType> definition present - ::CORBA::StringSeq_var res_seq = 0; - ACE_NEW_THROW_EX (res_seq, - ::CORBA::StringSeq (1), - CORBA::NO_MEMORY ()); - res_seq->length (0); - - while (name == XStr (ACE_TEXT ("resourceType"))) - { - ::CORBA::ULong index = res_seq->length (); - res_seq->length (res_seq->length () + 1); - res_seq [index] = - CIAO::Config_Handler::Utils::parse_string (iter); - name = node->getNodeName (); - } - - // On exit go one step back to faciliate parsing next tag - iter->previousNode (); - - // Assign this sequence to the Return Structure - ret_struct.resourceType = res_seq; - } - - else if (name == XStr (ACE_TEXT ("property"))) - { - valid_property = 1; - Deployment::SatisfierProperties_var property_seq = 0; - DOMNodeIterator * property_iter = 0; - ACE_NEW_THROW_EX (property_seq, - Deployment::SatisfierProperties, - CORBA::NO_MEMORY ()); - property_seq->length (0); - while (name == XStr (ACE_TEXT ("property"))) - { - // Check for <href> tags - if (node->hasAttributes ()) - { - xercesc::DOMNamedNodeMap * named_node_map = - node->getAttributes (); - int length = named_node_map->getLength (); - if (length > 1) - { - for (int j = 0; j < length; j++) - { - DOMNode * attr_node = named_node_map->item (j); - XStr attr_node_name = attr_node->getNodeName (); - char* attr_node_value_ch = - XMLString::transcode (attr_node->getNodeValue ()); - ACE_TString attr_node_value = attr_node_value_ch; - XMLString::release (&attr_node_value_ch); - if (attr_node_name = XStr (ACE_TEXT ("href"))) - { - XMLURL url (attr_node_value.c_str ()); - DOMNodeIterator * value_iter = - Utils::parse_href_tag (url, - node->getOwnerDocument ()); - // Get to the root-node - value_iter->nextNode (); - - // Process the property href tag - property_iter = value_iter; - } - } - } - } - else - property_iter = iter; - - // Copy the property onto the sequence - ::CORBA::ULong index = property_seq->length (); - property_seq->length (property_seq->length () + 1); - CIAO::Config_Handler::SP_Handler:: - process_SatisfierProperty (property_iter, - property_seq [index]); - - // Get next node - iter->nextNode (); - name = node->getNodeName (); - } - - // On exit go one step back to faciliate parsing next tag - iter->previousNode (); - - // Copy the sequence to return structure - ret_struct.property = property_seq; - } - else - { - if (! valid_name || ! valid_resourceType || ! valid_property) - ACE_DEBUG ((LM_DEBUG, "Config_Handlers::RS_Handler::process_ \ - RequirementSatisfier element mismatch expected <name>,\ - <resourceType> <property>\n")); - // On exit go one step back as one might have processed the next - // valid tag - iter->previousNode (); - - // Exit out of the for loop - break; - } - } -} diff --git a/TAO/CIAO/DnC/Config_Handlers/RS_Handler.h b/TAO/CIAO/DnC/Config_Handlers/RS_Handler.h deleted file mode 100644 index 11d858b4141..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/RS_Handler.h +++ /dev/null @@ -1,57 +0,0 @@ -//================================================================== -/** - * @file RS_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//================================================================== - -#ifndef RS_HANDLER_H -#define RS_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class RS_Handler - * - * @brief Handler class for <RequirementSatisfier> type - * - * This class defines handler methods to parse RequirementSatisfier - * types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - class Config_Handler_Export RS_Handler - { - public: - static void - process_RequirementSatisfier (DOMNodeIterator * iter, - Deployment::RequirementSatisfier &ret_struct); - // process elements of type RequirementSatisfier definitions in - // the descriptor files - - }; - } -} - -#include /**/ "ace/post.h" - -#endif /* ID_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/RUK_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/RUK_Handler.cpp deleted file mode 100644 index 08f390824dc..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/RUK_Handler.cpp +++ /dev/null @@ -1,61 +0,0 @@ -//================================================================== -/** - * @file RUK_Handler.cpp - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//===================================================================== - -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" - -#include "IAD_Handler.h" -#include "RUK_Handler.h" -#include "Utils.h" - -#include <iostream> - -using std::cerr; -using std::endl; - -namespace CIAO -{ - namespace Config_Handler - { - /* - * Class ResourceUsageKind_Handler - */ - - void RUK_Handler::process_ResourceUsageKind - (DOMNodeIterator *iter, ::Deployment::ResourceUsageKind &kind) - { - // -- ResourceUsageKind enum - XStr none ("None"); - XStr instance_uses_resource ("InstanceUsesResource"); - XStr resource_uses_instance ("ResourceUsesInstance"); - XStr port_uses_resource ("PortUsesResource"); - XStr resource_uses_port ("ResourceUsesPort"); - - XStr kind_str = XStr (Utils::parse_string (iter)); - if (kind_str == none) - kind = Deployment::None; - else if (kind_str = instance_uses_resource) - kind = Deployment::InstanceUsesResource; - else if (kind_str == resource_uses_instance) - kind = Deployment::ResourceUsesInstance; - else if (kind_str == port_uses_resource) - kind = Deployment::PortUsesResource; - else if (kind_str == resource_uses_port) - kind = Deployment::ResourceUsesPort; - - // Something wrong here.. Throw exception - ACE_DEBUG ((LM_DEBUG, - "Config_Handler::RUK_Handler::process_ResourceUsageKind \ - illegal <ResourceUsageKind> value found \n")); - ACE_THROW (CORBA::INTERNAL ()); - } - } -} diff --git a/TAO/CIAO/DnC/Config_Handlers/RUK_Handler.h b/TAO/CIAO/DnC/Config_Handlers/RUK_Handler.h deleted file mode 100644 index 70536e39072..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/RUK_Handler.h +++ /dev/null @@ -1,77 +0,0 @@ -//================================================================== -/** - * @file RUK_Handler.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef RUK_HANDLER_H -#define RUK_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -namespace CIAO -{ - namespace Config_Handler - { - - /** - * @class RUK_Handler - * - * @brief Handler class for <ResourceUsageKind> type - * - * This class defines handler methods to parse ResourceUsage - * Kind types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - - class Config_Handler_Export RUK_Handler { - public: - - /// Process elements of type ResourceUsageKind definitions in - /// the description files. - static void - process_ResourceUsageKind (DOMNodeIterator *iter, ::Deployment::ResourceUsageKind &kind); - }; - - } - -} - -#include /**/ "ace/post.h" - -#endif /* RUK_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Requirement_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Requirement_Handler.cpp deleted file mode 100644 index bc5b1fcb56a..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Requirement_Handler.cpp +++ /dev/null @@ -1,113 +0,0 @@ -//$Id$ - -#include "Requirement_Handler.h" -#include "Property_Handler.h" -#include "tao/Exception.h" -#include "Utils.h" - -using CIAO::Config_Handler::Property_Handler; - -void -CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator * iter, - Deployment::Requirement &ret_struct) -{ - int valid_resourceType = 0, valid_property = 0, valid_name = 0; - for (DOMNode * node = iter->nextNode (); - node != 0; - node = iter->nextNode ()) - { - XStr name (node->getNodeName ()); - if (name == XStr (ACE_TEXT ("resourceType"))) - { - valid_resourceType = 1; - // Populate the structure - ret_struct.resourceType = - CIAO::Config_Handler::Utils::parse_string (iter); - } - else if (name == XStr (ACE_TEXT ("property"))) - { - Deployment::Properties_var properties = 0; - ACE_NEW_THROW_EX (properties, - Deployment::Properties, - CORBA::NO_MEMORY ()); - properties->length (0); - - for (node = iter->nextNode (); - name == XStr (ACE_TEXT ("property")); - iter->nextNode ()) - { - // Increment length of sequence - ::CORBA::ULong index = properties->length (); - properties->length (properties->length () + 1); - DOMNodeIterator * property_iter = 0; - - // Check for <href> tags - if (node->hasAttributes ()) - { - xercesc::DOMNamedNodeMap * named_node_map = - node->getAttributes (); - int length = named_node_map->getLength (); - - if (length > 1) - { - for (int j = 0; j < length; j++) - { - DOMNode * attr_node = named_node_map->item (j); - XStr attr_node_name = attr_node->getNodeName (); - char* attr_node_value_ch = - XMLString::transcode (attr_node->getNodeValue ()); - ACE_TString attr_node_value = attr_node_value_ch; - auto_ptr<char> cleanup_char (attr_node_value_ch); - if (attr_node_name = XStr (ACE_TEXT ("href"))) - { - XMLURL url (attr_node_value.c_str ()); - DOMNodeIterator * value_iter = - Utils::parse_href_tag (url, - node->getOwnerDocument ()); - // Get to the root-node - value_iter->nextNode (); - - // Process the property href tag - property_iter = value_iter; - } - } - } - else - property_iter = iter; - - // Deep copy the value - CIAO::Config_Handler::Property_Handler:: - process_Property (property_iter, properties [index]); - } - } - valid_property = 1; - - // On exit go one step back to faciliate parsing next tag - iter->previousNode (); - - // Copy sequence on to return struct - ret_struct.property = properties; - } - else if (name == XStr (ACE_TEXT ("name"))) - { - valid_name = 1; - ret_struct.name = CIAO::Config_Handler::Utils::parse_string (iter); - } - else - { - if (! valid_resourceType || - ! valid_property || - ! valid_name) - { - ACE_DEBUG ((LM_DEBUG, - "Config_Handlers::Requirement_Handler::process_\ - Requirement element mismatch expected <resourceType>\ - , <property> or <name>")); - ACE_THROW (CORBA::INTERNAL ()); - } - // On exit go one step back as we have read one too many - iter->previousNode (); - break; - } - } -} diff --git a/TAO/CIAO/DnC/Config_Handlers/Requirement_Handler.h b/TAO/CIAO/DnC/Config_Handlers/Requirement_Handler.h deleted file mode 100644 index b960e9b70d7..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Requirement_Handler.h +++ /dev/null @@ -1,57 +0,0 @@ -//================================================================== -/** - * @file Requirement_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef REQUIREMENT_HANDLER_H -#define REQUIREMENT_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class Requirement_Handler - * - * @brief Handler class for <ImplementationDependency> type - * - * This class defines handler methods to parse Implementation - * Dependency types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - class Config_Handler_Export Requirement_Handler - { - public: - static void - process_Requirement (DOMNodeIterator * iter, - Deployment::Requirement &ret_struct); - // process elements of type Requirement in the descriptor files - - }; - } - -} - -#include /**/ "ace/post.h" - -#endif /* REQUIREMENT_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/SPK_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/SPK_Handler.cpp deleted file mode 100644 index e7731252994..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/SPK_Handler.cpp +++ /dev/null @@ -1,41 +0,0 @@ -//$Id$ - -#include "SPK_Handler.h" -#include "tao/Exception.h" -#include "Utils.h" - -using CIAO::Config_Handler::Utils; - -void -CIAO::Config_Handler::SPK_Handler:: -process_SatisfierPropertyKind (DOMNodeIterator * iter, - Deployment::SatisfierPropertyKind &kind) -{ - // -- SatisfierPropertyKind enum - XStr quantity ("Quantity"); - XStr capacity ("Capacity"); - XStr minimum ("Minimum"); - XStr maximum ("Maximum"); - XStr attribute ("Attribute"); - XStr selection ("Selection"); - - XStr kind_str = XStr (Utils::parse_string (iter)); - if (kind_str == quantity) - kind = Deployment::Quantity; - else if (kind_str = capacity) - kind = Deployment::Capacity; - else if (kind_str == minimum) - kind = Deployment::Minimum; - else if (kind_str == maximum) - kind = Deployment::Maximum; - else if (kind_str == attribute) - kind = Deployment::Attribute; - else if (kind_str == selection) - kind = Deployment::Selection; - - // Something wrong here.. Throw exception - ACE_DEBUG ((LM_DEBUG, - "Config_Handler::SPK_Handler::process_SPK \ - illegal <SatisfierPropertyKind> value found \n")); - ACE_THROW (CORBA::INTERNAL ()); -} diff --git a/TAO/CIAO/DnC/Config_Handlers/SPK_Handler.h b/TAO/CIAO/DnC/Config_Handlers/SPK_Handler.h deleted file mode 100644 index 51b6f1eb8b2..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/SPK_Handler.h +++ /dev/null @@ -1,57 +0,0 @@ -//================================================================== -/** - * @file SPK_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef SPK_HANDLER_H -#define SPK_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class SPK_Handler - * - * @brief Handler class for <SatisfierPropertyKind> type - * - * This class defines handler methods to parse Implementation - * Dependency types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - class Config_Handler_Export SPK_Handler - { - public: - static void process_SatisfierPropertyKind (DOMNodeIterator * iter, - Deployment::SatisfierPropertyKind &kind); - // process elements of type SatisfierPropertyKind definitions in - // the descriptor files - - }; - } - -} - -#include /**/ "ace/post.h" - -#endif /* SPK_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/SP_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/SP_Handler.cpp deleted file mode 100644 index 842912db9ca..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/SP_Handler.cpp +++ /dev/null @@ -1,79 +0,0 @@ -//$Id$ - -#include "SP_Handler.h" -#include "Any_Handler.h" -#include "SPK_Handler.h" -#include "tao/Exception.h" -#include "ace/Auto_Ptr.h" -#include "Utils.h" - -using CIAO::Config_Handler::Utils; -using CIAO::Config_Handler::Any_Handler; - -void -CIAO::Config_Handler::SP_Handler:: -process_SatisfierProperty (DOMNodeIterator * iter, - Deployment::SatisfierProperty &property) -{ - for (DOMNode * node = iter->nextNode (); ; node = iter->nextNode ()) - { - // Get name of the current element - XStr name (node->getNodeName ()); - - if (name == XStr (ACE_TEXT ("name"))) - property.name = Utils::parse_string (iter); - else if (name == XStr (ACE_TEXT ("kind"))) - SPK_Handler::process_SatisfierPropertyKind (iter, property.kind); - else if (name == XStr (ACE_TEXT ("value"))) - { - // Check for <href> tags - if (node->hasAttributes ()) - { - xercesc::DOMNamedNodeMap * named_node_map = - node->getAttributes (); - int length = named_node_map->getLength (); - if (length > 1) - { - for (int j = 0; j < length; j++) - { - DOMNode * attr_node = named_node_map->item (j); - XStr attr_node_name = attr_node->getNodeName (); - char* attr_node_value_ch = - XMLString::transcode (attr_node->getNodeValue ()); - ACE_TString attr_node_value = attr_node_value_ch; - XMLString::release (&attr_node_value_ch); - if (attr_node_name = XStr (ACE_TEXT ("href"))) - { - XMLURL url (attr_node_value.c_str ()); - DOMNodeIterator * value_iter = - Utils::parse_href_tag (url, - node->getOwnerDocument ()); - - // Get to the root-node - value_iter->nextNode (); - - // Process the property href tag - Any_Handler::process_Any (value_iter, - property.value); - } - } - } - } - else - // Populate value for the Property - Any_Handler::process_Any (iter, property.value); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Config_Handlers::SP_Handler::process_ \ - RequirementSatisfier element mismatch expected <name> \ - or <PropertyKind> <Deployment:Any>")); - - // Get the previous iterator - iter->previousNode (); - - // Exit from the for loop - break; - } - } -} diff --git a/TAO/CIAO/DnC/Config_Handlers/SP_Handler.h b/TAO/CIAO/DnC/Config_Handlers/SP_Handler.h deleted file mode 100644 index a5402097793..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/SP_Handler.h +++ /dev/null @@ -1,56 +0,0 @@ -//================================================================== -/** - * @file SP_Handler.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef SP_HANDLER_H -#define SP_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" - -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLString; -using xercesc::DOMText; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; - -namespace CIAO -{ - namespace Config_Handler - { - /** - * @class SP_Handler - * - * @brief Handler class for <SatisfierProperty> type - * - * This class defines handler methods to parse Implementation - * Dependency types in the descriptor files. The corresponding - * CORBA IDL type for the schema element is returned. - * - */ - class Config_Handler_Export SP_Handler - { - public: - static void process_SatisfierProperty (DOMNodeIterator * iter, - Deployment::SatisfierProperty &property); - // process elements of type SatisfierProperty definitions in - // the descriptor files - - }; - } -} - -#include /**/ "ace/post.h" - -#endif /* ID_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.cpp deleted file mode 100644 index d145106bae5..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// $Id$ - -#include "tao/Exception.h" -#include "ace/Log_Msg.h" -#include "Property_Handler.h" -#include "Requirement_Handler.h" -#include "CPR_Handler.h" -#include "CompPkgDesc_Handler.h" -#include "TPD_Handler.h" -#include "Process_Element.h" -#include "Utils.h" - -BEGIN_DEPLOYMENT_NAMESPACE - -/// handle the package configuration and populate it -ACE_TString TPD_Handler::process_TopLevelPackageDescription() -{ - for (DOMNode* node = this->iter_->nextNode (); - node != 0; - node = this->iter_->nextNode ()) - { - XStr node_name (node->getNodeName()); - if (node_name == XStr - (ACE_TEXT ("Deployment:TopLevelPackageDescription"))) - { - } - else if (node_name == XStr(ACE_TEXT ("package"))) - { - if (node->hasAttributes ()) - { - DOMNamedNodeMap* named_node_map = node->getAttributes (); - - // the number of attributes - int length = named_node_map->getLength(); - // iterate the attributes - for (int j = 0; j < length; ++j) - { - DOMNode* attribute_node = named_node_map->item (j); - XStr strattrnodename (attribute_node->getNodeName ()); - - char * temp = - XMLString::transcode (attribute_node->getNodeValue ()); - ACE_TString aceattrnodevalue = temp; - XMLString::release (&temp); - - // if href is given find out the referenced position - // and process the element - if (strattrnodename == XStr (ACE_TEXT ("href"))) - { - XMLURL xml_url (aceattrnodevalue.c_str ()); - XMLURL result (aceattrnodevalue.c_str ()); - ACE_TString url_string = aceattrnodevalue.c_str (); - - char * temp = - XMLString::transcode ( doc_->getDocumentURI ()); - ACE_TString doc_path = temp; - XMLString::release (&temp); - - XMLCh * relative_path = - XMLString::transcode (doc_path.c_str ()); - result.makeRelativeTo (relative_path); - XMLString::release (&relative_path); - - temp = XMLString::transcode (result.getURLText ()); - ACE_TString final_url = temp; - XMLString::release (&temp); - - if (xml_url.isRelative ()) - { - return final_url; - } - else - { - return url_string; - } - } - } - } - } - else - { - break; - } - } - ACE_THROW (CORBA::INTERNAL()); -} - -END_DEPLOYMENT_NAMESPACE diff --git a/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.h b/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.h deleted file mode 100644 index 30265026f8c..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.h +++ /dev/null @@ -1,87 +0,0 @@ -//================================================================== -/** - * @file TPD_Handler.h - * - * $Id$ - * - * @author Emre Turkay <turkaye@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef TPD_HANDLER_H -#define TPD_HANDLER_H -#include /**/ "ace/pre.h" - -#include "DeploymentC.h" -#include "Config_Handler_export.h" -#include "Basic_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include "XercesString.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMText; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -BEGIN_DEPLOYMENT_NAMESPACE - -/** - * @class TPD_Handler - * - * @brief Handler class for <TopLevelPackageConfiguration> type - * - * This class is within the Component Data Model subpackage of the - * Deployment & Configuration package. - * - * This class defines handler methods to parse the aforementioned type - * in the description files. The corresponding CORBA IDL type for this - * element is returned. - */ - -class Config_Handler_Export TPD_Handler: public Basic_Handler -{ -public: - - /// constructor - TPD_Handler (DOMDocument* doc, unsigned long filter_) - : Basic_Handler (doc, filter_) { } - - /// constructor - TPD_Handler (DOMNodeIterator* iter, bool release = false) - : Basic_Handler (iter, release) { } - - /// constructor - TPD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false) - : Basic_Handler (doc, iter, release) { } - - /// Process the package configuration - ACE_TString process_TopLevelPackageDescription (); - -}; - -END_DEPLOYMENT_NAMESPACE - -#include /**/ "ace/post.h" - -#endif /* TPD_HANDLER_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/Utils.cpp b/TAO/CIAO/DnC/Config_Handlers/Utils.cpp deleted file mode 100644 index 526d757dbd9..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Utils.cpp +++ /dev/null @@ -1,353 +0,0 @@ -//$Id$ - -#include "Utils.h" -#include "ace/OS_NS_stdlib.h" -#include "ace/Log_Msg.h" -#include "ace/SString.h" -#include "ace/Auto_Ptr.h" - -#include "XercesString.h" -#include <xercesc/util/XMLURL.hpp> -#include <xercesc/util/XMLUri.hpp> -#include <xercesc/util/XMLUniDefs.hpp> - -using xercesc::XMLUri; -using xercesc::XMLURL; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::XMLUni; -using xercesc::DOMImplementation; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMNodeFilter; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationLS; - -char * -CIAO::Config_Handler::Utils::parse_string (DOMNodeIterator * iter) -{ - DOMNode * node = iter->nextNode(); - DOMText* text = ACE_reinterpret_cast (DOMText*, node); - return XMLString::transcode (text->getNodeValue ()); -} - -CORBA::Short -CIAO::Config_Handler::Utils::parse_short (DOMNodeIterator * iter) -{ - char *temp = Config_Handler::Utils::parse_string (iter); - CORBA::Short ret_val = ACE_OS::atoi (temp); - XMLString::release (&temp); - return ret_val; -} - -CORBA::ULong -CIAO::Config_Handler::Utils::parse_ulong (DOMNodeIterator * iter) -{ - char *temp = Config_Handler::Utils::parse_string (iter); - CORBA::ULong ret_val = ACE_OS::strtoul (temp, 0, 10); - XMLString::release (&temp); - return ret_val; -} - -CORBA::Long -CIAO::Config_Handler::Utils::parse_long (DOMNodeIterator * iter) -{ - char *temp = Config_Handler::Utils::parse_string (iter); - CORBA::ULong ret_val = ACE_OS::strtol (temp, 0, 10); - XMLString::release (&temp); - return ret_val; -} - -CORBA::Double -CIAO::Config_Handler::Utils::parse_double (DOMNodeIterator * iter) -{ - char *temp = Config_Handler::Utils::parse_string (iter); - CORBA::Double ret_val = ACE_OS::strtod (temp, 0); - XMLString::release (&temp); - return ret_val; -} - -CORBA::Float -CIAO::Config_Handler::Utils::parse_float (DOMNodeIterator * iter) -{ - return ACE_static_cast (CORBA::Float, Utils::parse_double (iter)); -} - -CORBA::Boolean -CIAO::Config_Handler::Utils::parse_bool (DOMNodeIterator * iter) -{ - XStr true_val ("true"); - XStr true_cap_val ("TRUE"); - - DOMText * text = ACE_reinterpret_cast (DOMText *, iter->nextNode ()); - XStr value (text->getNodeValue ()); - - if (value == true_val || value == true_cap_val) - return 1; - else - return 0; -} - -CORBA::Char -CIAO::Config_Handler::Utils::parse_char (DOMNodeIterator * iter) -{ - DOMText * text = ACE_reinterpret_cast (DOMText *, iter->nextNode ()); - char * temp_string = XMLString::transcode (text->getNodeValue ()); - - // Should be non-null - ACE_ASSERT (temp_string != 0); - - // Return the first character in the node as char value - char ret_char = temp_string [0]; - XMLString::release (&temp_string); - return ret_char; -} - -CORBA::Octet -CIAO::Config_Handler::Utils::parse_octet (DOMNodeIterator * iter) -{ - return Utils::parse_char (iter); -} - -bool -CIAO::Config_Handler::Utils::process_string (DOMNodeIterator* iter, - const XStr& node_name, const char* name, - TAO_String_Manager& var) -{ - bool result = (node_name == XStr(ACE_TEXT (name))); - if (result == true) - { - DOMNode* node = iter->nextNode(); - const XMLCh* text = ACE_reinterpret_cast(DOMText*, node)->getNodeValue -(); - if (text) - var = XMLString::transcode (text); - } - return result; -} - -bool -CIAO::Config_Handler::Utils::process_string_seq (DOMNodeIterator* iter, - const XStr& node_name, const char* name, - CORBA::StringSeq& seq) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - DOMNode* node = iter->nextNode (); - const XMLCh* text = ACE_reinterpret_cast - (DOMText*, node)->getNodeValue (); - - if (text) - { - CORBA::ULong i (seq.length ()); - seq.length (i + 1); - seq[i] = XMLString::transcode (text); - } - } - - return result; -} - -bool -CIAO::Config_Handler::Utils::process_ulong (DOMNodeIterator* iter, - const XStr& node_name, const char* name, - CORBA::ULong& var) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - DOMNode* node = iter->nextNode (); - const XMLCh* text = ACE_reinterpret_cast - (DOMText*, node)->getNodeValue (); - - if (text) - { - CORBA::String_var temp = XMLString::transcode (text); - var = ACE_static_cast (CORBA::ULong, ACE_OS::strtol (temp.in (), - 0, 10)); - } - } - - return result; -} - -bool -CIAO::Config_Handler::Utils::process_boolean (DOMNodeIterator* iter, - const XStr& node_name, const char* name, - CORBA::Boolean& var) -{ - bool result = (node_name == XStr (ACE_TEXT (name))); - - if (result == true) - { - DOMNode* node = iter->nextNode (); - const XMLCh* text = ACE_reinterpret_cast - (DOMText*, node)->getNodeValue (); - - if (text) - { - CORBA::String_var temp = XMLString::transcode (text); - var = ACE_static_cast (CORBA::Boolean, ACE_OS::strtol (temp.in (), - 0, 10)); - } - } - - return result; -} - -DOMDocument* -CIAO::Config_Handler::Utils::create_document (const char * url) -{ - xercesc::XMLPlatformUtils::Initialize(); - static const XMLCh gLS[] = { xercesc::chLatin_L, - xercesc::chLatin_S, - xercesc::chNull }; - - DOMImplementation* impl - = DOMImplementationRegistry::getDOMImplementation(gLS); - //auto_ptr<DOMImplementation> cleanup_impl (impl); - - DOMBuilder* parser = - ((DOMImplementationLS*)impl)-> - createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); - //auto_ptr<DOMBuilder> cleanup_parser (parser); - - // Discard comment nodes in the document - parser->setFeature (XMLUni::fgDOMComments, false); - - // Disable datatype normalization. The XML 1.0 attribute value - // normalization always occurs though. - parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true); - - // Do not create EntityReference nodes in the DOM tree. No - // EntityReference nodes will be created, only the nodes - // corresponding to their fully expanded sustitution text will be - // created. - parser->setFeature (XMLUni::fgDOMEntities, false); - - // Perform Namespace processing. - parser->setFeature (XMLUni::fgDOMNamespaces, true); - - // Perform Validation - parser->setFeature (XMLUni::fgDOMValidation, true); - - // Do not include ignorable whitespace in the DOM tree. - parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false); - - // Enable the parser's schema support. - parser->setFeature (XMLUni::fgXercesSchema, true); - - // Enable full schema constraint checking, including checking which - // may be time-consuming or memory intensive. Currently, particle - // unique attribution constraint checking and particle derivation - // restriction checking are controlled by this option. - parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true); - - // The parser will treat validation error as fatal and will exit. - parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true); - - - DOMDocument* doc = parser->parseURI (url); - //auto_ptr<DOMDocument> cleanup_doc (doc); - - return doc; -} - -DOMBuilder* -CIAO::Config_Handler::Utils::create_parser () -{ - xercesc::XMLPlatformUtils::Initialize(); - static const XMLCh gLS[] = { xercesc::chLatin_L, - xercesc::chLatin_S, - xercesc::chNull }; - - DOMImplementation* impl - = DOMImplementationRegistry::getDOMImplementation(gLS); - //auto_ptr<DOMImplementation> cleanup_impl (impl); - - DOMBuilder* parser = - ((DOMImplementationLS*)impl)-> - createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); - //auto_ptr<DOMBuilder> cleanup_parser (parser); - - // Discard comment nodes in the document - parser->setFeature (XMLUni::fgDOMComments, false); - - // Disable datatype normalization. The XML 1.0 attribute value - // normalization always occurs though. - parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true); - - // Do not create EntityReference nodes in the DOM tree. No - // EntityReference nodes will be created, only the nodes - // corresponding to their fully expanded sustitution text will be - // created. - parser->setFeature (XMLUni::fgDOMEntities, false); - - // Perform Namespace processing. - parser->setFeature (XMLUni::fgDOMNamespaces, true); - - // Perform Validation - parser->setFeature (XMLUni::fgDOMValidation, true); - - // Do not include ignorable whitespace in the DOM tree. - parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false); - - // Enable the parser's schema support. - parser->setFeature (XMLUni::fgXercesSchema, true); - - // Enable full schema constraint checking, including checking which - // may be time-consuming or memory intensive. Currently, particle - // unique attribution constraint checking and particle derivation - // restriction checking are controlled by this option. - parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true); - - // The parser will treat validation error as fatal and will exit. - parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true); - - - //DOMDocument* doc = parser->parseURI (url); - //auto_ptr<DOMDocument> cleanup_doc (doc); - - return parser; -} - -DOMNodeIterator * -CIAO::Config_Handler::Utils::parse_href_tag (XMLURL url, DOMDocument * doc) -{ - char * document_path = 0; - if (url.isRelative ()) - { - char * doc_path = XMLString::transcode (doc->getDocumentURI ()); - XMLCh * temp = XMLString::transcode (doc_path); - url.makeRelativeTo (temp); - document_path = XMLString::transcode (url.getURLText ()); - - // Release allocated memory - XMLString::release (&doc_path); - XMLString::release (&temp); - } - else - { - document_path = XMLString::transcode (url.getURLText ()); - - } - - DOMDocument* href_doc = - CIAO::Config_Handler::Utils::create_document (document_path); - //auto_ptr<DOMDocument> cleanup_doc (href_doc); - - DOMDocumentTraversal* traverse = href_doc; - DOMNode* root = (href_doc->getDocumentElement ()); - unsigned long filter = DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT; - - // release allocated memory - XMLString::release (&document_path); - - return traverse->createNodeIterator (root, - filter, - 0, - true); -} diff --git a/TAO/CIAO/DnC/Config_Handlers/Utils.h b/TAO/CIAO/DnC/Config_Handlers/Utils.h deleted file mode 100644 index dd051603d40..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/Utils.h +++ /dev/null @@ -1,118 +0,0 @@ -//==================================================================== -/** - * @file Utils.h - * - * $Id$ - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * @author Tao Lu <lu@dre.vanderbilt.edu>, - * @author Boris <boris@dre.vanderbilt.edu> - * - */ -//===================================================================== - -#ifndef UTILS_H -#define UTILS_H - -#include /**/ "ace/pre.h" - -#include "Config_Handler_export.h" -#include "DeploymentC.h" - -#include "tao/Basic_Types.h" -#include "XercesString.h" -#include <xercesc/util/XercesDefs.hpp> -#include <xercesc/dom/DOM.hpp> -#include <xercesc/util/XMLURL.hpp> - -using xercesc::XMLURL; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMText; -using xercesc::DOMBuilder; -using xercesc::XMLString; -using xercesc::DOMDocument; -using Config_Handler::XStr; - -namespace CIAO { - - namespace Config_Handler - { - - /** - * @class Utils - * - * @brief Utility class for parsing basic types such as string float - * double etc. - * - * Helper methods for each type are defined as parse_<type> where type - * equals string, float, double etc. The corresponding C++ types are - * returned. These follow the IDL to C++ mapping defined by the CORBA - * specification. - * - */ - - class Config_Handler_Export Utils - { - public: - static char * parse_string (DOMNodeIterator * iter); - // Parse string type - - static CORBA::ULong parse_ulong (DOMNodeIterator * iter); - // Parse ulong type - - static CORBA::Long parse_long (DOMNodeIterator * iter); - // Parse long type - - static CORBA::Short parse_short (DOMNodeIterator * iter); - // Parse short type - - static CORBA::Float parse_float (DOMNodeIterator * iter); - // Parse float type - - static CORBA::Double parse_double (DOMNodeIterator * iter); - // Parse double type - - static CORBA::Boolean parse_bool (DOMNodeIterator * iter); - // Parse bool type - - static CORBA::Char parse_char (DOMNodeIterator * iter); - // Parse char type - - static CORBA::Octet parse_octet (DOMNodeIterator * iter); - // Parse octect type - - static DOMDocument* create_document (const char * url); - // Create a document from the URL - - static DOMBuilder* create_parser (); - // Create a parser from the URL - - static bool process_string (DOMNodeIterator* iter, const XStr& node_name, - const char* name, TAO_String_Manager& var); - // process strings - - static bool process_string_seq (DOMNodeIterator* iter, - const XStr& node_name, - const char* name, CORBA::StringSeq& seq); - // process string sequence - - static bool process_boolean (DOMNodeIterator* iter, - const XStr& node_name, - const char* name, CORBA::Boolean& var); - // process strings - - static bool process_ulong (DOMNodeIterator* iter, const XStr& node_name, - const char* name, CORBA::ULong& var); - // process ulong - - - static DOMNodeIterator * parse_href_tag (XMLURL xml_url, - DOMDocument * doc); - // Process the <href = "URL"> and return an iterator to the - // new document - }; - } - -} -#endif /* UTILS_H */ diff --git a/TAO/CIAO/DnC/Config_Handlers/XercesString.cpp b/TAO/CIAO/DnC/Config_Handlers/XercesString.cpp deleted file mode 100644 index 7b719e4dc80..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/XercesString.cpp +++ /dev/null @@ -1,145 +0,0 @@ -// $Id$ - -#include <ostream> - -#include "XercesString.h" -using xercesc::XMLString; - -namespace Config_Handler -{ - - XStr::XStr (const char* str) - : _wstr(0) - { - _wstr = XMLString::transcode(str); - } - - XStr::XStr (XMLCh *wstr) - : _wstr(wstr) - { - - } - - XStr::XStr (const XMLCh* wstr) - : _wstr(0) - { - _wstr = XMLString::replicate(wstr); - } - - XStr::XStr (const XStr &right) - : _wstr(0) - { - _wstr = XMLString::replicate(right._wstr); - } - - XStr& XStr::operator= (const XStr& rhs) - { - if (&rhs == this) - return *this; - XStr temp (rhs); - ACE_Swap<XMLCh*>::swap (this->_wstr, temp._wstr); - return *this; - } - - XStr::~XStr () - { - if (_wstr) - XMLString::release(&_wstr); - } - - const XMLCh* XStr::begin () const - { - return _wstr; - } - - const XMLCh* XStr::end () const - { - return _wstr + size(); - } - - bool XStr::append(const XMLCh *tail) - { - int iTailLen = XMLString::stringLen(tail); - int iWorkLen = XMLString::stringLen(_wstr); - XMLCh *result = new XMLCh[ iWorkLen + iTailLen + 1 ]; - bool bOK = result != 0; - if (bOK) - { - XMLCh *target = result; - XMLString::moveChars(target, _wstr, iWorkLen); - target += iWorkLen; - XMLString::moveChars(target, tail, iTailLen); - target += iTailLen; - *target++ = 0; - XMLString::release(&_wstr); - _wstr = result; - } - return bOK; - } - - bool XStr::erase(const XMLCh *head, const XMLCh *tail) - { - bool bOK = head <= tail && head >= begin() && tail <= end(); - if (bOK) - { - XMLCh *result = new XMLCh[ size() - (tail - head) + 1 ]; - XMLCh *target = result; - bOK = target != NULL; - if (bOK) - { - const XMLCh *cursor = begin(); - - while (cursor != head) *target++ = *cursor++; - cursor = tail; - while ( cursor != end() ) *target++ = *cursor++; - *target ++ = 0; - XMLString::release(&_wstr); - _wstr = result; - } - } - return bOK; - } - - int XStr::size () const - { - return XMLString::stringLen(_wstr); - } - - XMLCh XStr::operator [] (const int i) - { - return _wstr[i]; - } - - const XMLCh XStr::operator [] (const int i) const - { - return _wstr[i]; - } - - bool XStr::operator== (const XMLCh* wstr) const - { - return XMLString::compareIString (wstr, this->_wstr) == 0; - } - - bool operator== (const XStr& lhs, const XStr& rhs) - { - return XMLString::compareIString (lhs,rhs) == 0; - } - - bool operator!= (const XStr& lhs, const XStr& rhs) - { - return !operator==(lhs, rhs); - } - - - std::ostream& - operator<< (std::ostream& o, XStr const& str) - { - char* s = XMLString::transcode (str); - - o << s; - - XMLString::release (&s); // idiots? - return o; - } - -} diff --git a/TAO/CIAO/DnC/Config_Handlers/XercesString.h b/TAO/CIAO/DnC/Config_Handlers/XercesString.h deleted file mode 100644 index 87ef31c3c2c..00000000000 --- a/TAO/CIAO/DnC/Config_Handlers/XercesString.h +++ /dev/null @@ -1,76 +0,0 @@ -// $Id$ - -#ifndef _XERCESSTRING_H -#define _XERCESSTRING_H - -#include /**/ "ace/pre.h" - -#include "ace/Swap.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include <iosfwd> - -#include <xercesc/util/XMLString.hpp> - -// Utility class that provides a std::string like facade to XMLString. -// Doesn't implement all of the methods of std::string. - -namespace Config_Handler -{ - - class XStr - { - public: - XStr() : _wstr(0L) { }; - - XStr (const char* str); - - XStr (XMLCh* wstr); - - XStr (const XMLCh* wstr); - - XStr (const XStr& copy); - - XStr& operator= (const XStr& rhs); - - ~XStr(); - - const XMLCh* begin() const; - - const XMLCh* end() const; - - bool append(const XMLCh* tail); - - bool erase(const XMLCh* head, const XMLCh* tail); - - int size() const; - - XMLCh operator [] (const int i); - - const XMLCh operator [] (const int i) const; - - operator const XMLCh* () const { return _wstr; }; - - bool operator== (const XMLCh* wstr) const; - - - private: - - XMLCh* _wstr; // Internal representation - - }; - - bool operator== (const XStr& lhs, const XStr& rhs); - bool operator!= (const XStr& lhs, const XStr& rhs); - - std::ostream& - operator<< (std::ostream& o, XStr const& str); - -} - -#include /**/ "ace/post.h" - -#endif /* _XERCESSTRING_H */ diff --git a/TAO/CIAO/DnC/Deployment.mwc b/TAO/CIAO/DnC/Deployment.mwc deleted file mode 100644 index fcf95d10967..00000000000 --- a/TAO/CIAO/DnC/Deployment.mwc +++ /dev/null @@ -1,4 +0,0 @@ -// $Id$ - -workspace { -} diff --git a/TAO/CIAO/DnC/Deployment.xsd b/TAO/CIAO/DnC/Deployment.xsd deleted file mode 100644 index c8a6399730b..00000000000 --- a/TAO/CIAO/DnC/Deployment.xsd +++ /dev/null @@ -1,776 +0,0 @@ -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:Deployment="http://www.omg.org/Deployment" - targetNamespace="http://www.omg.org/Deployment"> - - <xsd:import namespace="http://www.omg.org/XMI" schemaLocation="XMI.xsd" /> - - - <xsd:complexType name="Any"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Any" type="Deployment:Any"/> - <xsd:complexType name="DataType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="kind" type="Deployment:TCKind"/> - <xsd:element name="enum" type="Deployment:EnumType"/> - <xsd:element name="objref" type="Deployment:ObjrefType"/> - <xsd:element name="boundedString" type="Deployment:BoundedStringType"/> - <xsd:element name="fixed" type="Deployment:FixedType"/> - <xsd:element name="array" type="Deployment:ArrayType"/> - <xsd:element name="sequence" type="Deployment:SequenceType"/> - <xsd:element name="alias" type="Deployment:AliasType"/> - <xsd:element name="struct" type="Deployment:StructType"/> - <xsd:element name="value" type="Deployment:ValueType"/> - <xsd:element name="union" type="Deployment:UnionType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataType" type="Deployment:DataType"/> - <xsd:complexType name="DataValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="short" type="xsd:short"/> - <xsd:element name="long" type="xsd:int"/> - <xsd:element name="ushort" type="xsd:unsignedShort"/> - <xsd:element name="ulong" type="xsd:unsignedInt"/> - <xsd:element name="float" type="xsd:float"/> - <xsd:element name="double" type="xsd:double"/> - <xsd:element name="boolean" type="xsd:boolean"/> - <xsd:element name="octet" type="xsd:unsignedByte"/> - <xsd:element name="opaque" type="xsd:base64Binary"/> - <xsd:element name="objref" type="xsd:string"/> - <xsd:element name="enum" type="xsd:string"/> - <xsd:element name="string" type="xsd:string"/> - <xsd:element name="longlong" type="xsd:long"/> - <xsd:element name="ulonglong" type="xsd:unsignedLong"/> - <xsd:element name="longdouble" type="xsd:double"/> - <xsd:element name="fixed" type="xsd:string"/> - <xsd:element name="any" type="Deployment:Any"/> - <xsd:element name="typecode" type="Deployment:DataType"/> - <xsd:element name="element" type="Deployment:DataValue"/> - <xsd:element name="discriminator" type="Deployment:DataValue"/> - <xsd:element name="value" type="Deployment:DataValue"/> - <xsd:element name="boxedValue" type="Deployment:DataValue"/> - <xsd:element name="member" type="Deployment:NamedValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataValue" type="Deployment:DataValue"/> - - - <xsd:complexType name="EnumType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="EnumType" type="Deployment:EnumType"/> - <xsd:complexType name="ObjrefType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - - - <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/> - <xsd:complexType name="BoundedStringType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="BoundedStringType" type="Deployment:BoundedStringType"/> - <xsd:complexType name="FixedType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="digits" type="xsd:string"/> - <xsd:element name="scale" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="FixedType" type="Deployment:FixedType"/> - <xsd:complexType name="ArrayType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="length" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArrayType" type="Deployment:ArrayType"/> - <xsd:complexType name="SequenceType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SequenceType" type="Deployment:SequenceType"/> - <xsd:complexType name="AliasType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AliasType" type="Deployment:AliasType"/> - <xsd:complexType name="StructType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="Deployment:StructMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructType" type="Deployment:StructType"/> - <xsd:complexType name="StructMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructMemberType" type="Deployment:StructMemberType"/> - <xsd:complexType name="ValueType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="modifier" type="xsd:string"/> - <xsd:element name="baseType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:ValueMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueType" type="Deployment:ValueType"/> - <xsd:complexType name="ValueMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="visibility" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueMemberType" type="Deployment:ValueMemberType"/> - <xsd:complexType name="UnionType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="default" type="Deployment:UnionMemberType"/> - <xsd:element name="discriminatorType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:UnionMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionType" type="Deployment:UnionType"/> - <xsd:complexType name="UnionMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="label" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionMemberType" type="Deployment:UnionMemberType"/> - <xsd:complexType name="NamedValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedValue" type="Deployment:NamedValue"/> - <xsd:complexType name="Bridge"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connect" type="Deployment:Interconnect"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Bridge" type="Deployment:Bridge"/> - <xsd:complexType name="Interconnect"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Bridge"/> - <xsd:element name="connect" type="Deployment:Node"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Interconnect" type="Deployment:Interconnect"/> - <xsd:complexType name="Node"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Interconnect"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Node" type="Deployment:Node"/> - <xsd:complexType name="Resource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Resource" type="Deployment:Resource"/> - <xsd:complexType name="SharedResource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SharedResource" type="Deployment:SharedResource"/> - <xsd:complexType name="Domain"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="interconnect" type="Deployment:Interconnect"/> - <xsd:element name="bridge" type="Deployment:Bridge"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Domain" type="Deployment:Domain"/> - <xsd:complexType name="PlanPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanPropertyMapping" type="Deployment:PlanPropertyMapping"/> - <xsd:complexType name="PlanSubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPropertyReference" type="Deployment:PlanSubcomponentPropertyReference"/> - <xsd:complexType name="PlanSubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPortEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:complexType name="PlanConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanConnectionDescription" type="Deployment:PlanConnectionDescription"/> - <xsd:complexType name="InstanceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceDeploymentDescription" type="Deployment:InstanceDeploymentDescription"/> - <xsd:complexType name="MonolithicDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicDeploymentDescription" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:complexType name="ArtifactDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArtifactDeploymentDescription" type="Deployment:ArtifactDeploymentDescription"/> - - - <xsd:complexType name="DeploymentPlan"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - <xsd:element name="connection" type="Deployment:PlanConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DeploymentPlan" type="Deployment:DeploymentPlan"/> - - - <xsd:complexType name="ResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ResourceDeploymentDescription" type="Deployment:ResourceDeploymentDescription"/> - <xsd:complexType name="InstanceResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceResourceDeploymentDescription" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:complexType name="ConnectionResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="targetName" type="xsd:string"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ConnectionResourceDeploymentDescription" type="Deployment:ConnectionResourceDeploymentDescription"/> - <xsd:complexType name="Capability"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Capability" type="Deployment:Capability"/> - <xsd:complexType name="ComponentPropertyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPropertyDescription" type="Deployment:ComponentPropertyDescription"/> - <xsd:complexType name="ComponentPortDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="exclusiveProvider" type="xsd:string"/> - <xsd:element name="exclusiveUser" type="xsd:string"/> - <xsd:element name="optional" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPortDescription" type="Deployment:ComponentPortDescription"/> - <xsd:complexType name="ComponentInterfaceDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="idlFile" type="xsd:string"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="port" type="Deployment:ComponentPortDescription"/> - <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/> - <xsd:complexType name="ImplementationArtifactDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationArtifactDescription" type="Deployment:ImplementationArtifactDescription"/> - <xsd:complexType name="MonolithicImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicImplementationDescription" type="Deployment:MonolithicImplementationDescription"/> - <xsd:complexType name="AssemblyPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyPropertyMapping" type="Deployment:AssemblyPropertyMapping"/> - <xsd:complexType name="SubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPropertyReference" type="Deployment:SubcomponentPropertyReference"/> - <xsd:complexType name="SubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPortEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:complexType name="AssemblyConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyConnectionDescription" type="Deployment:AssemblyConnectionDescription"/> - <xsd:complexType name="SubcomponentInstantiationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentInstantiationDescription" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:complexType name="ComponentAssemblyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentAssemblyDescription" type="Deployment:ComponentAssemblyDescription"/> - <xsd:complexType name="ComponentImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/> - <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="capability" type="Deployment:Capability"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentImplementationDescription" type="Deployment:ComponentImplementationDescription"/> - <xsd:complexType name="ComponentPackageReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredUUID" type="xsd:string"/> - <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageReference" type="Deployment:ComponentPackageReference"/> - <xsd:complexType name="ComponentPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageDescription" type="Deployment:ComponentPackageDescription"/> - <xsd:complexType name="PackageConfiguration"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/> - <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackageConfiguration" type="Deployment:PackageConfiguration"/> - <xsd:complexType name="PackagedComponentImplementation"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackagedComponentImplementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:complexType name="NamedImplementationArtifact"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedImplementationArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:complexType name="ImplementationRequirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="resourcePort" type="xsd:string"/> - <xsd:element name="componentPort" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationRequirement" type="Deployment:ImplementationRequirement"/> - <xsd:complexType name="RequirementSatisfier"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="RequirementSatisfier" type="Deployment:RequirementSatisfier"/> - <xsd:complexType name="SatisfierProperty"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SatisfierProperty" type="Deployment:SatisfierProperty"/> - <xsd:complexType name="Requirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Requirement" type="Deployment:Requirement"/> - <xsd:complexType name="Property"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Property" type="Deployment:Property"/> - <xsd:complexType name="ExternalReferenceEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="location" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:complexType name="ComponentExternalPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:complexType name="ImplementationDependency"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredType" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/> - <xsd:complexType name="TopLevelPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="package" type="Deployment:PackageConfiguration"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="TopLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/> - <xsd:simpleType name="TCKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="tk_null"/> - <xsd:enumeration value="tk_void"/> - <xsd:enumeration value="tk_short"/> - <xsd:enumeration value="tk_long"/> - <xsd:enumeration value="tk_ushort"/> - <xsd:enumeration value="tk_ulong"/> - <xsd:enumeration value="tk_float"/> - <xsd:enumeration value="tk_double"/> - <xsd:enumeration value="tk_boolean"/> - <xsd:enumeration value="tk_char"/> - <xsd:enumeration value="tk_octet"/> - <xsd:enumeration value="tk_any"/> - <xsd:enumeration value="tk_TypeCode"/> - <xsd:enumeration value="tk_Principal"/> - <xsd:enumeration value="tk_objref"/> - <xsd:enumeration value="tk_struct"/> - <xsd:enumeration value="tk_union"/> - <xsd:enumeration value="tk_enum"/> - <xsd:enumeration value="tk_string"/> - <xsd:enumeration value="tk_sequence"/> - <xsd:enumeration value="tk_array"/> - <xsd:enumeration value="tk_alias"/> - <xsd:enumeration value="tk_except"/> - <xsd:enumeration value="tk_longlong"/> - <xsd:enumeration value="tk_ulonglong"/> - <xsd:enumeration value="tk_longdouble"/> - <xsd:enumeration value="tk_wchar"/> - <xsd:enumeration value="tk_wstring"/> - <xsd:enumeration value="tk_wfixed"/> - <xsd:enumeration value="tk_value"/> - <xsd:enumeration value="tk_value_box"/> - <xsd:enumeration value="tk_native"/> - <xsd:enumeration value="tk_abstract_interface"/> - <xsd:enumeration value="tk_local_interface"/> - <xsd:enumeration value="tk_component"/> - <xsd:enumeration value="tk_home"/> - <xsd:enumeration value="tk_event"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ResourceUsageKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="None"/> - <xsd:enumeration value="InstanceUsesResource"/> - <xsd:enumeration value="ResourceUsesInstance"/> - <xsd:enumeration value="PortUsesResource"/> - <xsd:enumeration value="ResourceUsesPort"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CCMComponentPortKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Facet"/> - <xsd:enumeration value="SimplexReceptacle"/> - <xsd:enumeration value="MultiplexReceptacle"/> - <xsd:enumeration value="EventEmitter"/> - <xsd:enumeration value="EventPublisher"/> - <xsd:enumeration value="EventConsumer"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SatisfierPropertyKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Quantity"/> - <xsd:enumeration value="Capacity"/> - <xsd:enumeration value="Minimum"/> - <xsd:enumeration value="Maximum"/> - <xsd:enumeration value="Attribute"/> - <xsd:enumeration value="Selection"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> diff --git a/TAO/CIAO/DnC/Deployment.xsd.orig b/TAO/CIAO/DnC/Deployment.xsd.orig deleted file mode 100644 index a59a47f1360..00000000000 --- a/TAO/CIAO/DnC/Deployment.xsd.orig +++ /dev/null @@ -1,897 +0,0 @@ -<xsd:schema - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:Deployment="http://www.omg.org/Deployment" - targetNamespace="http://www.omg.org/Deployment" - > - <xsd:import namespace="http://www.omg.org/XMI"/> - <xsd:complexType name="Any"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Any" type="Deployment:Any"/> - <xsd:complexType name="DataType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="kind" type="Deployment:TCKind"/> - <xsd:element name="enum" type="Deployment:EnumType"/> - <xsd:element name="objref" type="Deployment:ObjrefType"/> - <xsd:element name="boundedString" type="Deployment:BoundedStringType"/> - <xsd:element name="fixed" type="Deployment:FixedType"/> - <xsd:element name="array" type="Deployment:ArrayType"/> - <xsd:element name="sequence" type="Deployment:SequenceType"/> - <xsd:element name="alias" type="Deployment:AliasType"/> - <xsd:element name="struct" type="Deployment:StructType"/> - <xsd:element name="value" type="Deployment:ValueType"/> - <xsd:element name="union" type="Deployment:UnionType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataType" type="Deployment:DataType"/> - <xsd:complexType name="DataValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="short" type="xsd:short"/> - <xsd:element name="long" type="xsd:int"/> - <xsd:element name="ushort" type="xsd:unsignedShort"/> - <xsd:element name="ulong" type="xsd:unsignedInt"/> - <xsd:element name="float" type="xsd:float"/> - <xsd:element name="double" type="xsd:double"/> - <xsd:element name="boolean" type="xsd:boolean"/> - <xsd:element name="octet" type="xsd:unsignedByte"/> - <xsd:element name="opaque" type="xsd:base64Binary"/> - <xsd:element name="objref" type="xsd:string"/> - <xsd:element name="enum" type="xsd:string"/> - <xsd:element name="string" type="xsd:string"/> - <xsd:element name="longlong" type="xsd:long"/> - <xsd:element name="ulonglong" type="xsd:unsignedLong"/> - <xsd:element name="longdouble" type="xsd:double"/> - <xsd:element name="fixed" type="xsd:string"/> - <xsd:element name="any" type="Deployment:Any"/> - <xsd:element name="typecode" type="Deployment:DataType"/> - <xsd:element name="element" type="Deployment:DataValue"/> - <xsd:element name="discriminator" type="Deployment:DataValue"/> - <xsd:element name="value" type="Deployment:DataValue"/> - <xsd:element name="boxedValue" type="Deployment:DataValue"/> - <xsd:element name="member" type="Deployment:NamedValue"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataValue" type="Deployment:DataValue"/> - <xsd:complexType name="EnumType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="EnumType" type="Deployment:EnumType"/> - <xsd:complexType name="ObjrefType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/> - <xsd:complexType name="BoundedStringType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="BoundedStringType" type="Deployment:BoundedStringType"/> - <xsd:complexType name="FixedType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="digits" type="xsd:string"/> - <xsd:element name="scale" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="FixedType" type="Deployment:FixedType"/> - <xsd:complexType name="ArrayType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="length" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArrayType" type="Deployment:ArrayType"/> - <xsd:complexType name="SequenceType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SequenceType" type="Deployment:SequenceType"/> - <xsd:complexType name="AliasType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AliasType" type="Deployment:AliasType"/> - <xsd:complexType name="StructType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="Deployment:StructMemberType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructType" type="Deployment:StructType"/> - <xsd:complexType name="StructMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructMemberType" type="Deployment:StructMemberType"/> - <xsd:complexType name="ValueType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="modifier" type="xsd:string"/> - <xsd:element name="baseType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:ValueMemberType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueType" type="Deployment:ValueType"/> - <xsd:complexType name="ValueMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="visibility" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueMemberType" type="Deployment:ValueMemberType"/> - <xsd:complexType name="UnionType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="default" type="Deployment:UnionMemberType"/> - <xsd:element name="discriminatorType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:UnionMemberType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionType" type="Deployment:UnionType"/> - <xsd:complexType name="UnionMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="label" type="Deployment:DataValue"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionMemberType" type="Deployment:UnionMemberType"/> - <xsd:complexType name="NamedValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:DataValue"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedValue" type="Deployment:NamedValue"/> - <xsd:complexType name="Bridge"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connect" type="Deployment:Interconnect"/> - <xsd:element name="resource" type="Deployment:Resource"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Bridge" type="Deployment:Bridge"/> - <xsd:complexType name="Interconnect"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Bridge"/> - <xsd:element name="connect" type="Deployment:Node"/> - <xsd:element name="resource" type="Deployment:Resource"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Interconnect" type="Deployment:Interconnect"/> - <xsd:complexType name="Node"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Interconnect"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="resource" type="Deployment:Resource"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Node" type="Deployment:Node"/> - <xsd:complexType name="Resource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Resource" type="Deployment:Resource"/> - <xsd:complexType name="SharedResource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SharedResource" type="Deployment:SharedResource"/> - <xsd:complexType name="Domain"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="interconnect" type="Deployment:Interconnect"/> - <xsd:element name="bridge" type="Deployment:Bridge"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Domain" type="Deployment:Domain"/> - <xsd:complexType name="PlanPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanPropertyMapping" type="Deployment:PlanPropertyMapping"/> - <xsd:complexType name="PlanSubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPropertyReference" type="Deployment:PlanSubcomponentPropertyReference"/> - <xsd:complexType name="PlanSubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPortEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:complexType name="PlanConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanConnectionDescription" type="Deployment:PlanConnectionDescription"/> - <xsd:complexType name="InstanceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceDeploymentDescription" type="Deployment:InstanceDeploymentDescription"/> - <xsd:complexType name="MonolithicDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicDeploymentDescription" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:complexType name="ArtifactDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArtifactDeploymentDescription" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:complexType name="DeploymentPlan"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - <xsd:element name="connection" type="Deployment:PlanConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DeploymentPlan" type="Deployment:DeploymentPlan"/> - <xsd:complexType name="ResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ResourceDeploymentDescription" type="Deployment:ResourceDeploymentDescription"/> - <xsd:complexType name="InstanceResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceResourceDeploymentDescription" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:complexType name="ConnectionResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="targetName" type="xsd:string"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ConnectionResourceDeploymentDescription" type="Deployment:ConnectionResourceDeploymentDescription"/> - <xsd:complexType name="Capability"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Capability" type="Deployment:Capability"/> - <xsd:complexType name="ComponentPropertyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPropertyDescription" type="Deployment:ComponentPropertyDescription"/> - <xsd:complexType name="ComponentPortDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="exclusiveProvider" type="xsd:string"/> - <xsd:element name="exclusiveUser" type="xsd:string"/> - <xsd:element name="optional" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPortDescription" type="Deployment:ComponentPortDescription"/> - <xsd:complexType name="ComponentInterfaceDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="idlFile" type="xsd:string"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="port" type="Deployment:ComponentPortDescription"/> - <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/> - <xsd:complexType name="ImplementationArtifactDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationArtifactDescription" type="Deployment:ImplementationArtifactDescription"/> - <xsd:complexType name="MonolithicImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicImplementationDescription" type="Deployment:MonolithicImplementationDescription"/> - <xsd:complexType name="AssemblyPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyPropertyMapping" type="Deployment:AssemblyPropertyMapping"/> - <xsd:complexType name="SubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPropertyReference" type="Deployment:SubcomponentPropertyReference"/> - <xsd:complexType name="SubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPortEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:complexType name="AssemblyConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyConnectionDescription" type="Deployment:AssemblyConnectionDescription"/> - <xsd:complexType name="SubcomponentInstantiationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentInstantiationDescription" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:complexType name="ComponentAssemblyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentAssemblyDescription" type="Deployment:ComponentAssemblyDescription"/> - <xsd:complexType name="ComponentImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/> - <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="capability" type="Deployment:Capability"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentImplementationDescription" type="Deployment:ComponentImplementationDescription"/> - <xsd:complexType name="ComponentPackageReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredUUID" type="xsd:string"/> - <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageReference" type="Deployment:ComponentPackageReference"/> - <xsd:complexType name="ComponentPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageDescription" type="Deployment:ComponentPackageDescription"/> - <xsd:complexType name="PackageConfiguration"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/> - <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackageConfiguration" type="Deployment:PackageConfiguration"/> - <xsd:complexType name="PackagedComponentImplementation"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackagedComponentImplementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:complexType name="NamedImplementationArtifact"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedImplementationArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:complexType name="ImplementationRequirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="resourcePort" type="xsd:string"/> - <xsd:element name="componentPort" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationRequirement" type="Deployment:ImplementationRequirement"/> - <xsd:complexType name="RequirementSatisfier"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="RequirementSatisfier" type="Deployment:RequirementSatisfier"/> - <xsd:complexType name="SatisfierProperty"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SatisfierProperty" type="Deployment:SatisfierProperty"/> - <xsd:complexType name="Requirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Requirement" type="Deployment:Requirement"/> - <xsd:complexType name="Property"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Property" type="Deployment:Property"/> - <xsd:complexType name="ExternalReferenceEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="location" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:complexType name="ComponentExternalPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:complexType name="ImplementationDependency"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredType" type="xsd:string"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/> - <xsd:complexType name="TopLevelPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="package" type="Deployment:PackageConfiguration"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="TopLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/> - <xsd:simpleType name="TCKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="tk_null"/> - <xsd:enumeration value="tk_void"/> - <xsd:enumeration value="tk_short"/> - <xsd:enumeration value="tk_long"/> - <xsd:enumeration value="tk_ushort"/> - <xsd:enumeration value="tk_ulong"/> - <xsd:enumeration value="tk_float"/> - <xsd:enumeration value="tk_double"/> - <xsd:enumeration value="tk_boolean"/> - <xsd:enumeration value="tk_char"/> - <xsd:enumeration value="tk_octet"/> - <xsd:enumeration value="tk_any"/> - <xsd:enumeration value="tk_TypeCode"/> - <xsd:enumeration value="tk_Principal"/> - <xsd:enumeration value="tk_objref"/> - <xsd:enumeration value="tk_struct"/> - <xsd:enumeration value="tk_union"/> - <xsd:enumeration value="tk_enum"/> - <xsd:enumeration value="tk_string"/> - <xsd:enumeration value="tk_sequence"/> - <xsd:enumeration value="tk_array"/> - <xsd:enumeration value="tk_alias"/> - <xsd:enumeration value="tk_except"/> - <xsd:enumeration value="tk_longlong"/> - <xsd:enumeration value="tk_ulonglong"/> - <xsd:enumeration value="tk_longdouble"/> - <xsd:enumeration value="tk_wchar"/> - <xsd:enumeration value="tk_wstring"/> - <xsd:enumeration value="tk_wfixed"/> - <xsd:enumeration value="tk_value"/> - <xsd:enumeration value="tk_value_box"/> - <xsd:enumeration value="tk_native"/> - <xsd:enumeration value="tk_abstract_interface"/> - <xsd:enumeration value="tk_local_interface"/> - <xsd:enumeration value="tk_component"/> - <xsd:enumeration value="tk_home"/> - <xsd:enumeration value="tk_event"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ResourceUsageKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="None"/> - <xsd:enumeration value="InstanceUsesResource"/> - <xsd:enumeration value="ResourceUsesInstance"/> - <xsd:enumeration value="PortUsesResource"/> - <xsd:enumeration value="ResourceUsesPort"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CCMComponentPortKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Facet"/> - <xsd:enumeration value="SimplexReceptacle"/> - <xsd:enumeration value="MultiplexReceptacle"/> - <xsd:enumeration value="EventEmitter"/> - <xsd:enumeration value="EventPublisher"/> - <xsd:enumeration value="EventConsumer"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SatisfierPropertyKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Quantity"/> - <xsd:enumeration value="Capacity"/> - <xsd:enumeration value="Minimum"/> - <xsd:enumeration value="Maximum"/> - <xsd:enumeration value="Attribute"/> - <xsd:enumeration value="Selection"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:element name="Deployment"> - <xsd:complexType> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element ref="Deployment:Any"/> - <xsd:element ref="Deployment:DataType"/> - <xsd:element ref="Deployment:DataValue"/> - <xsd:element ref="Deployment:EnumType"/> - <xsd:element ref="Deployment:ObjrefType"/> - <xsd:element ref="Deployment:BoundedStringType"/> - <xsd:element ref="Deployment:FixedType"/> - <xsd:element ref="Deployment:ArrayType"/> - <xsd:element ref="Deployment:SequenceType"/> - <xsd:element ref="Deployment:AliasType"/> - <xsd:element ref="Deployment:StructType"/> - <xsd:element ref="Deployment:StructMemberType"/> - <xsd:element ref="Deployment:ValueType"/> - <xsd:element ref="Deployment:ValueMemberType"/> - <xsd:element ref="Deployment:UnionType"/> - <xsd:element ref="Deployment:UnionMemberType"/> - <xsd:element ref="Deployment:NamedValue"/> - <xsd:element ref="Deployment:Bridge"/> - <xsd:element ref="Deployment:Interconnect"/> - <xsd:element ref="Deployment:Node"/> - <xsd:element ref="Deployment:Resource"/> - <xsd:element ref="Deployment:SharedResource"/> - <xsd:element ref="Deployment:Domain"/> - <xsd:element ref="Deployment:PlanPropertyMapping"/> - <xsd:element ref="Deployment:PlanSubcomponentPropertyReference"/> - <xsd:element ref="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:element ref="Deployment:PlanConnectionDescription"/> - <xsd:element ref="Deployment:InstanceDeploymentDescription"/> - <xsd:element ref="Deployment:MonolithicDeploymentDescription"/> - <xsd:element ref="Deployment:ArtifactDeploymentDescription"/> - <xsd:element ref="Deployment:DeploymentPlan"/> - <xsd:element ref="Deployment:ResourceDeploymentDescription"/> - <xsd:element ref="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:element ref="Deployment:ConnectionResourceDeploymentDescription"/> - <xsd:element ref="Deployment:Capability"/> - <xsd:element ref="Deployment:ComponentPropertyDescription"/> - <xsd:element ref="Deployment:ComponentPortDescription"/> - <xsd:element ref="Deployment:ComponentInterfaceDescription"/> - <xsd:element ref="Deployment:ImplementationArtifactDescription"/> - <xsd:element ref="Deployment:MonolithicImplementationDescription"/> - <xsd:element ref="Deployment:AssemblyPropertyMapping"/> - <xsd:element ref="Deployment:SubcomponentPropertyReference"/> - <xsd:element ref="Deployment:SubcomponentPortEndpoint"/> - <xsd:element ref="Deployment:AssemblyConnectionDescription"/> - <xsd:element ref="Deployment:SubcomponentInstantiationDescription"/> - <xsd:element ref="Deployment:ComponentAssemblyDescription"/> - <xsd:element ref="Deployment:ComponentImplementationDescription"/> - <xsd:element ref="Deployment:ComponentPackageReference"/> - <xsd:element ref="Deployment:ComponentPackageDescription"/> - <xsd:element ref="Deployment:PackageConfiguration"/> - <xsd:element ref="Deployment:PackagedComponentImplementation"/> - <xsd:element ref="Deployment:NamedImplementationArtifact"/> - <xsd:element ref="Deployment:ImplementationRequirement"/> - <xsd:element ref="Deployment:RequirementSatisfier"/> - <xsd:element ref="Deployment:SatisfierProperty"/> - <xsd:element ref="Deployment:Requirement"/> - <xsd:element ref="Deployment:Property"/> - <xsd:element ref="Deployment:ExternalReferenceEndpoint"/> - <xsd:element ref="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element ref="Deployment:ImplementationDependency"/> - <xsd:element ref="Deployment:TopLevelPackageDescription"/> - <xsd:element ref="xmi:Extension"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - </xsd:element> -</xsd:schema> diff --git a/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.cpp b/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.cpp deleted file mode 100644 index c42e892081d..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// $Id$ - -#include "Deployment_Configuration.h" - -#include "ace/OS_NS_stdio.h" - -#if !defined (__ACE_INLINE__) -# include "Deployment_Configuration.inl" -#endif /* __ACE_INLINE__ */ - -const int NAME_BUFSIZE = 1024; - -CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o) - : orb_ (CORBA::ORB::_duplicate (o)) -{ -} - -CIAO::Deployment_Configuration::~Deployment_Configuration (void) -{ - this->deployment_info_.unbind_all (); -} - -int -CIAO::Deployment_Configuration::init (const char *filename) -{ - // @@ We should change to use ACE_Configuration here. - - if (filename == 0) - return -1; - - FILE *inf = ACE_OS::fopen (filename, "r"); - - if (inf == NULL) - ACE_ERROR_RETURN ((LM_ERROR, - "Fail to open node manager map data file: %s.\n", - filename), - -1); - - char destination[NAME_BUFSIZE], ior[NAME_BUFSIZE]; - - int first = 1; - - while (fscanf (inf, "%s %s", destination, ior ) != EOF) - { - this->deployment_info_.bind (destination, ior); - - if (first) - { - this->default_node_manager_.IOR_ = ior; - first = 0; - } - } - - return 0; -} - -const char * -CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) -{ - if (name == 0) - return get_default_node_manager_ior (); - - ACE_Hash_Map_Entry - <ACE_CString, - CIAO::Deployment_Configuration::Node_Manager_Info> *entry; - - if (this->deployment_info_.find (ACE_CString (name), - entry) != 0) - return 0; // no valid name found. - - return entry->int_id_.IOR_.c_str (); -} - -const char * -CIAO::Deployment_Configuration::get_default_node_manager_ior (void) -{ - if (this->default_node_manager_.IOR_.length () == 0) - return 0; - return this->default_node_manager_.IOR_.c_str (); -} - -::Deployment::NodeManager_ptr -CIAO::Deployment_Configuration::get_node_manager (const char *name - ACE_ENV_ARG_DECL) -{ - if (name == 0) - return get_default_node_manager (ACE_ENV_SINGLE_ARG_PARAMETER); - - ACE_Hash_Map_Entry - <ACE_CString, - CIAO::Deployment_Configuration::Node_Manager_Info> *entry; - - if (this->deployment_info_.find (ACE_CString (name), - entry) != 0) - return 0; // no valid name found. - - if (CORBA::is_nil (entry->int_id_.node_manager_.in ())) - { - CORBA::Object_var temp = this->orb_->string_to_object - (entry->int_id_.IOR_.c_str () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - entry->int_id_.node_manager_ = - ::Deployment::NodeManager::_narrow (temp.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - } - return ::Deployment::NodeManager::_duplicate - (entry->int_id_.node_manager_.in ()); -} - -::Deployment::NodeManager_ptr -CIAO::Deployment_Configuration::get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL) -{ - if (CORBA::is_nil (this->default_node_manager_.node_manager_.in ())) - { - CORBA::Object_var temp = this->orb_->string_to_object - (this->default_node_manager_.IOR_.c_str () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - this->default_node_manager_.node_manager_ = - ::Deployment::NodeManager::_narrow (temp.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - } - return ::Deployment::NodeManager::_duplicate - (this->default_node_manager_.node_manager_.in ()); -} diff --git a/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.h b/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.h deleted file mode 100644 index 3fe47051fcf..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.h +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Deployment_Configuration.h - * - * $Id$ - * - * The Deployment_Configuration provides abstraction for the - * deployment mechanisms. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - * @author Gan Deng <gan.deng@vanderbilt.edu> - */ -//============================================================================= - - -#ifndef CIAO_DEPLOYMENT_CONFIGURATION_H -#define CIAO_DEPLOYMENT_CONFIGURATION_H -#include /**/ "ace/pre.h" - -#include "ace/Hash_Map_Manager_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "DeploymentC.h" - -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/Valuetype_Adapter_Impl.h" - -namespace CIAO -{ - /** - * @class Deployment_Configuration - * - * @brief A class that provides strategies on deployment topology. - * - * This class provides strategies on how the DomainApplicationManager - * should deploy an deployment plan at domain-level. This is achieved - * by providing mappings from deployment destination names to actually - * NodeManager daemon IORs, and the strategy for which default NodeManager - * daemons a deployment mechanism should use. - * - * This is a trivial implementation of the deployment configuration - * strategy. We can enhance this class later on to provide - * different deployment location strategies, such as naming service. - */ - class Deployment_Configuration - { - public: - typedef struct _node_manager_info - { - _node_manager_info (const char *ior = 0) - { - IOR_ = ior; - } - - ACE_CString IOR_; - ::Deployment::NodeManager_var node_manager_; - } Node_Manager_Info; - - Deployment_Configuration (CORBA::ORB_ptr o); - - /// Destructor - virtual ~Deployment_Configuration (void); - - /** - * Init method takes the filename to a configuration file which - * has a simple line format of name, ior string delimited by a - * space in each line. - * - * name IOR-string - * - * @retval 0 on success. - * @retval -1 otherwise. - */ - int init (const char *filename); - - /** - * @retval 0 if no valid name were found. When @c name = 0, then - * this function behave exactly as get_default_activator_ior. - */ - virtual const char *get_node_manager_ior (const char *name); - - /** - * Return the default NodeManager the DomainApplicationManager - * should use to deploy a component. In this implementation, the - * first entry in the deployment configuration data file is always - * the entry for default activator. - * - * @retval 0 if no valid daemon is configured. - */ - virtual const char *get_default_node_manager_ior (); - - /** - * @retval nil if no valid name were found. - */ - virtual ::Deployment::NodeManager_ptr - get_node_manager (const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - /** - * Return the reference to the default NodeManager the - * DomainApplicationManager should use to deploy a node-level - * deployment plan.. - * - * @retval nil if no valid daemon is configured. - */ - virtual ::Deployment::NodeManager_ptr - get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - - protected: - CORBA::ORB_var orb_; - - ACE_Hash_Map_Manager_Ex<ACE_CString, - Node_Manager_Info, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> deployment_info_; - - Node_Manager_Info default_node_manager_; - }; - -} - -#if defined (__ACE_INLINE__) -# include "Deployment_Configuration.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" -#endif /* CIAO_DEPLOYMENT_CONFIGURATION_H */ diff --git a/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.inl b/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.inl deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/Deployment_Configuration.inl +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager.mpc b/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager.mpc deleted file mode 100644 index 0224dda614f..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager.mpc +++ /dev/null @@ -1,16 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project (DomainApplicationManager): taolib, ciao_deployment_stub, ciao_deployment_svnt { - after += Config_Handlers Node_Daemon - - sharedname = DomainApplicationManager - dynamicflags = DOMAINAPPLICATIONMANAGER_BUILD_DLL - libs += TAO_Valuetype CIAO_DnC_Client CIAO_DnC_Server Config_Handlers TAO_IFR_Client - - Source_Files { - DomainApplicationManager_Impl.cpp - Deployment_Configuration.cpp - } -} - diff --git a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Export.h b/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Export.h deleted file mode 100644 index 31fa9b914b7..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s DomainApplicationManager -// ------------------------------ -#ifndef DOMAINAPPLICATIONMANAGER_EXPORT_H -#define DOMAINAPPLICATIONMANAGER_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DOMAINAPPLICATIONMANAGER_HAS_DLL) -# define DOMAINAPPLICATIONMANAGER_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DOMAINAPPLICATIONMANAGER_HAS_DLL */ - -#if !defined (DOMAINAPPLICATIONMANAGER_HAS_DLL) -# define DOMAINAPPLICATIONMANAGER_HAS_DLL 1 -#endif /* ! DOMAINAPPLICATIONMANAGER_HAS_DLL */ - -#if defined (DOMAINAPPLICATIONMANAGER_HAS_DLL) && (DOMAINAPPLICATIONMANAGER_HAS_DLL == 1) -# if defined (DOMAINAPPLICATIONMANAGER_BUILD_DLL) -# define DomainApplicationManager_Export ACE_Proper_Export_Flag -# define DOMAINAPPLICATIONMANAGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DOMAINAPPLICATIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DOMAINAPPLICATIONMANAGER_BUILD_DLL */ -# define DomainApplicationManager_Export ACE_Proper_Import_Flag -# define DOMAINAPPLICATIONMANAGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DOMAINAPPLICATIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DOMAINAPPLICATIONMANAGER_BUILD_DLL */ -#else /* DOMAINAPPLICATIONMANAGER_HAS_DLL == 1 */ -# define DomainApplicationManager_Export -# define DOMAINAPPLICATIONMANAGER_SINGLETON_DECLARATION(T) -# define DOMAINAPPLICATIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DOMAINAPPLICATIONMANAGER_HAS_DLL == 1 */ - -// Set DOMAINAPPLICATIONMANAGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DOMAINAPPLICATIONMANAGER_NTRACE) -# if (ACE_NTRACE == 1) -# define DOMAINAPPLICATIONMANAGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DOMAINAPPLICATIONMANAGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DOMAINAPPLICATIONMANAGER_NTRACE */ - -#if (DOMAINAPPLICATIONMANAGER_NTRACE == 1) -# define DOMAINAPPLICATIONMANAGER_TRACE(X) -#else /* (DOMAINAPPLICATIONMANAGER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DOMAINAPPLICATIONMANAGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DOMAINAPPLICATIONMANAGER_NTRACE == 1) */ - -#endif /* DOMAINAPPLICATIONMANAGER_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp deleted file mode 100644 index b8574c98d46..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ /dev/null @@ -1,759 +0,0 @@ -// $Id$ - -#include "DomainApplicationManager_Impl.h" -#include "ace/Null_Mutex.h" -#include "ace/OS_NS_string.h" - -#include "CIAO/DnC/Config_Handlers/DnC_Dump.h" - -#include "NodeManager/NodeDaemonC.h" - -#if !defined (__ACE_INLINE__) -# include "DomainApplicationManager_Impl.inl" -#endif /* __ACE_INLINE__ */ - -CIAO::DomainApplicationManager_Impl:: -DomainApplicationManager_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - Deployment::TargetManager_ptr manager, - const Deployment::DeploymentPlan & plan, - const char * deployment_file) - ACE_THROW_SPEC ((CORBA::SystemException)) - : orb_ (CORBA::ORB::_duplicate (orb)), - poa_ (PortableServer::POA::_duplicate (poa)), - target_manager_ (Deployment::TargetManager::_duplicate (manager)), - plan_ (plan), - num_child_plans_ (0), - // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet - // large. The maximum size of an ACE_Hash_Map_Manager is - // also fixed, i.e. it does not grow dynamically on demand. - // Make sure the default size of artifact_map_ is - // appropriate for your needs. You may also want to make - // the size configurable at compile-time, at least. - deployment_file_ (CORBA::string_dup (deployment_file)), - deployment_config_ (orb) -{ - ACE_NEW_THROW_EX (this->all_connections_, - Deployment::Connections (), - CORBA::NO_MEMORY ()); - ACE_CHECK; -} - -CIAO::DomainApplicationManager_Impl::~DomainApplicationManager_Impl () -{ - if (CIAO::debug_level () > 1) - { - ACE_DEBUG ((LM_DEBUG, "DomainApplicationManager destroyed\n")); - } -} - -void -CIAO::DomainApplicationManager_Impl:: -init (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::StartError, - Deployment::PlanError)) -{ - ACE_TRY - { - // (1) Call get_plan_info() method to get the total number - // of child plans and list of NodeManager names, and - // (2) Check the validity of the global deployment plan. - if (! this->get_plan_info ()) - ACE_THROW (Deployment::PlanError ()); - - // Call split_plan() - if (! this->split_plan ()) - ACE_THROW (Deployment::PlanError ()); - - // Invoke preparePlan for each child deployment plan. - for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i) - { - // Get the NodeManager object reference. - ::Deployment::NodeManager_var my_node_manager = - this->deployment_config_.get_node_manager - (this->node_manager_names_[i].c_str ()); - - // Get the child deployment plan reference. - ACE_Hash_Map_Entry - <ACE_CString, - Chained_Artifacts> *entry; - - if (this->artifact_map_.find (this->node_manager_names_[i], - entry) != 0) - ACE_THROW (Deployment::PlanError ()); - - Chained_Artifacts & artifacts = entry->int_id_; - - // Dump plans - if (CIAO::debug_level () > 1) - { - Deployment::DnC_Dump::dump (artifacts.child_plan_); - } - - // Call preparePlan() method on the NodeManager with the - // corresponding child plan as input, which returns a - // NodeApplicationManager object reference. - Deployment::ApplicationManager_var tmp_app_manager = - my_node_manager->preparePlan (artifacts.child_plan_ - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Deployment::NodeApplicationManager_var app_manager - = Deployment::NodeApplicationManager::_narrow (tmp_app_manager.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (app_manager.in ())) - { - ACE_DEBUG ((LM_DEBUG, "DomainAppMgr::init () received a nil\ - reference for NodeApplicationManager\n")); - ACE_THROW (Deployment::StartError ()); - } - ACE_TRY_CHECK; - - // Cache the NodeApplicationManager object reference. - artifacts.node_application_manager_ = app_manager._retn (); - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::init\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; - ACE_CHECK; -} - -bool -CIAO::DomainApplicationManager_Impl:: -get_plan_info (void) -{ - if ( this->deployment_config_.init (this->deployment_file_) == -1 ) - return 0; - - const CORBA::ULong length = this->plan_.instance.length (); - - // Error: If there are no nodes in the plan => No nodes to deploy the - // components - if (length == 0) - return false; - - // Copy the name of the node in the plan on to the node manager - // array, Making sure that duplicates are not added twice - int num_plans = 0; - for (CORBA::ULong index = 0; index < length; index ++) - { - bool matched = false; - - const CORBA::ULong number_node_managers = this->node_manager_names_.size (); - for (CORBA::ULong i = 0; i < number_node_managers; ++i) - // If a match is found do not add it to the list of unique - // node names - if (ACE_OS::strcmp (this->plan_.instance [index].node.in (), - (this->node_manager_names_ [i]).c_str ()) == 0) - { - // Break out -- Duplicates found - matched = true; - break; - } - - if (! matched) - { - // Check if there is a corresponding NodeManager instance existing - // If not present return false - ::Deployment::NodeManager_var mgr = - this->deployment_config_.get_node_manager - (this->plan_.instance [index].node.in ()); - - if (CORBA::is_nil (mgr.in ())) - return 0; /* Failure */ - - // Add this unique node_name to the list of NodeManager names - this->node_manager_names_.push_back (this->plan_.instance [index].node.in ()); - - // Increment the number of plans - ++ num_plans; - } - } - - // Set the length of the Node Managers - this->num_child_plans_ = num_plans; - - // Indicate success - return true; -} - -//@@ We should ask those spec writers to look at the code below, hopefully -// They will realize some thing. -int -CIAO::DomainApplicationManager_Impl:: -split_plan (void) -{ - // Initialize the total number of child deployment plans specified - // by the global plan. - CORBA::ULong i; - for ( i = 0; i < this->num_child_plans_; ++i) - { - ::Deployment::DeploymentPlan_var tmp_plan; - ACE_NEW_RETURN (tmp_plan, - ::Deployment::DeploymentPlan, - 0); - - tmp_plan->UUID = CORBA::string_dup (this->plan_.UUID.in ()); - - tmp_plan->implementation.length (0); - tmp_plan->instance.length (0); - tmp_plan->connection.length (0); - tmp_plan->externalProperty.length (0); - tmp_plan->dependsOn.length (0); - tmp_plan->artifact.length (0); - tmp_plan->infoProperty.length (0); - - Chained_Artifacts artifacts; - - // Fill in the child_plan_ field, relinquishing ownership - artifacts.child_plan_ = tmp_plan._retn (); - - // Fill in the node_manager_ field. - artifacts.node_manager_ = - this->deployment_config_.get_node_manager - (this->node_manager_names_[i].c_str ()); - - this->artifact_map_.bind (node_manager_names_[i], artifacts); - } - - // (1) Iterate over the <instance> field of the global DeploymentPlan - // variabl. - // (2) Retrieve the necessary information to contruct the node-level - // plans one by one. - for ( i = 0; i < (this->plan_.instance).length (); ++i) - { - // Fill in the child deployment plan in the map. - - // Get the instance deployment description - const ::Deployment::InstanceDeploymentDescription & my_instance = - (this->plan_.instance)[i]; - - // Find the corresponding child deployment plan entry in - // the hash map for this instance. - ACE_Hash_Map_Entry - <ACE_CString, - Chained_Artifacts> *entry; - - if (this->artifact_map_.find - (ACE_CString (my_instance.node.in ()), - entry) != 0) - return 0; // no valid name found. - - // Get the child plan. - ::Deployment::DeploymentPlan_var &child_plan = - (entry->int_id_).child_plan_; - - // Fill in the contents of the child plan entry. - - // Append the "MonolithicDeploymentDescriptions implementation" - // field with a new "implementation", which is specified by the - // <implementationRef> field of <my_instance> entry. NOTE: The - // <artifactRef> field needs to be changed accordingly. - const ::Deployment::MonolithicDeploymentDescription & my_implementation = - (this->plan_.implementation)[my_instance.implementationRef]; - - //Deployment::DnC_Dump::dump (this->plan_); - //Deployment::DnC_Dump::dump ( (this->plan_.implementation)[my_instance.implementationRef]); - - //ACE_DEBUG ((LM_DEBUG, "My implementation")); - //Deployment::DnC_Dump::dump (my_implementation); - - CORBA::ULong index_imp = child_plan->implementation.length (); - child_plan->implementation.length (++index_imp); - child_plan->implementation[index_imp-1] = my_implementation; - - // Initialize with the correct sequence length. - CORBA::ULongSeq ulong_seq; - ulong_seq.length (my_implementation.artifactRef.length ()); - - // Append the "ArtifactDeploymentDescriptions artifact" field - // with some new "artifacts", which is specified by the - // <artifactRef> sequence of <my_implementation> entry. - const CORBA::ULong impl_length = my_implementation.artifactRef.length (); - for (CORBA::ULong iter = 0; - iter < impl_length; - iter ++) - { - CORBA::ULong artifact_ref = my_implementation.artifactRef[iter]; - - // Fill in the <artifact> field of the child plan - CORBA::ULong index_art = child_plan->artifact.length (); - child_plan->artifact.length (++index_art); - child_plan->artifact[index_art-1] = - (this->plan_.artifact)[artifact_ref]; - - // Fill in the <artifactRef> field of the MonolithicDeploymentDescription - ulong_seq[iter] = index_art-1; - } - - // Change the <artifactRef> field of the "implementation". - child_plan->implementation[index_imp-1].artifactRef = ulong_seq; - - // Append the "InstanceDeploymentDescription instance" field with - // a new "instance", which is almost the same as the "instance" in - // the global plan except the <implementationRef> field. - // NOTE: The <implementationRef> field needs to be changed accordingly. - CORBA::ULong index_ins = child_plan->instance.length (); - child_plan->instance.length (++index_ins); - child_plan->instance[index_ins-1] = my_instance; - - // Change the <implementationRef> field of the "instance". - // @@ The implementationRef starts from 0. - // @@TODO: Below logic needs to be changed once we want to avoid - // duplicate <implementation> for the optimization. - child_plan->instance[index_ins-1].implementationRef = index_ins-1; - } - - return 1; -} - -void -CIAO::DomainApplicationManager_Impl:: -add_connections (const Deployment::Connections & incoming_conn) -{ - - CORBA::ULong old_len = this->all_connections_->length (); - - // Expand the length of the <all_connection_> sequence. - this->all_connections_->length (old_len + incoming_conn.length ()); - - // @@ (OO) Please change "i++" to "++i". The prefix increment - // operator is more efficient than the postfix increment - // operator. - - // @@ (OO) The "continue loop" condition portion of the for - // statement is executed during each loop iteration. To - // improve performance execute it only once outside the - // for-loop. - - // Store the connections to the <all_conections_> sequence - const CORBA::ULong conn_lenth = incoming_conn.length (); - for (CORBA::ULong i = 0; i < conn_lenth; ++i) - { - (*this->all_connections_)[old_len + i] = incoming_conn[i]; - } -} - -void -CIAO::DomainApplicationManager_Impl:: -startLaunch (const ::Deployment::Properties & configProperty, - ::CORBA::Boolean start - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::ResourceNotAvailable, - ::Deployment::StartError, - ::Deployment::InvalidProperty)) -{ - ACE_UNUSED_ARG (start); - ACE_TRY - { - // Invoke startLaunch() operations on each cached NodeApplicationManager - for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i) - { - // Get the NodeApplicationManager object reference. - ACE_Hash_Map_Entry - <ACE_CString, - Chained_Artifacts> *entry; - - if (this->artifact_map_.find (this->node_manager_names_[i], - entry) != 0) - ACE_THROW (Deployment::StartError ()); // Should never happen! - - ::Deployment::NodeApplicationManager_ptr my_nam = - (entry->int_id_).node_application_manager_.in (); - - if (CORBA::is_nil (my_nam)) - { - ACE_DEBUG ((LM_DEBUG, "While starting launch, the DomainApplicationManager\ - has a nil reference for NodeApplicationManager\n")); - ACE_THROW (Deployment::StartError ()); - } - ACE_TRY_CHECK; - - ::Deployment::Connections_var retn_connections; - - // Obtained the returned NodeApplication object reference - // and the returned Connections variable. - ::Deployment::Application_var temp_application = - my_nam->startLaunch (configProperty, - retn_connections.out (), - 0); // This is a mistake. This should never be here. - - // Narrow down to NodeApplication object reference - ::Deployment::NodeApplication_var my_na = - ::Deployment::NodeApplication::_narrow (temp_application.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (my_na.in ())) - { - ACE_DEBUG ((LM_DEBUG, "The DomainApplicationManager receives a nil\ - reference of NodeApplication after calling\ - startLaunch on NodeApplicationManager.\n")); - ACE_THROW (Deployment::StartError ()); - } - ACE_TRY_CHECK; - - // Cache the returned set of connections into the list. - this->add_connections (retn_connections); - - // Cache the returned NodeApplication object reference into - // the hash table. - (entry->int_id_).node_application_ = my_na._retn (); - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::startLaunch\t\n"); - ACE_RE_THROW; - return; // @@ (OO) What purpose does this "return" statement - // serve? - } - ACE_ENDTRY; - - ACE_CHECK_RETURN (0); -} - -void -CIAO::DomainApplicationManager_Impl:: -finishLaunch (::CORBA::Boolean start - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError)) -{ - ACE_TRY - { - // Invoke finishLaunch() operation on each cached NodeApplication object. - for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i) - { - // Get the NodeApplication object reference. - ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry; - - if (this->artifact_map_.find (this->node_manager_names_[i], - entry) != 0) - ACE_THROW (Deployment::StartError ()); // Should never happen! - - //@@ Note: Don't delete the below debugging helpers. - // Dump the connections for debug purpose. - if (CIAO::debug_level () > 1) - { - ACE_DEBUG ((LM_DEBUG, "==============================================\n")); - ACE_DEBUG ((LM_DEBUG, "dump incomming connection for child plan:%d\n", i)); - dump_connections (this->all_connections_.in ()); - ACE_DEBUG ((LM_DEBUG, "==============================================\n")); - } - - // Get the Connections variable. - Deployment::Connections * my_connections = - this->get_outgoing_connections ((entry->int_id_).child_plan_); - - if (my_connections == 0) - ACE_THROW (Deployment::StartError ()); - - Deployment::Connections_var safe (my_connections); - - // Dump the connections for debug purpose. - if (CIAO::debug_level () > 1) - { - ACE_DEBUG ((LM_DEBUG, "==============================================\n")); - ACE_DEBUG ((LM_DEBUG, "dump outgoingcomming connection for child plan:%d\n", i)); - dump_connections (safe.in ()); - ACE_DEBUG ((LM_DEBUG, "==============================================\n")); - } - - // Invoke finishLaunch() operation on NodeApplication. - entry->int_id_.node_application_->finishLaunch (safe.in (), - start - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::finishLaunch\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; - - ACE_CHECK_RETURN (0); -} - -void -CIAO::DomainApplicationManager_Impl:: -start (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::StartError)) -{ - ACE_TRY - { - // Invoke start() operation on each cached NodeApplication object. - for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i) - { - // Get the NodeApplication object reference. - ACE_Hash_Map_Entry - <ACE_CString, - Chained_Artifacts> *entry; - - if (this->artifact_map_.find (this->node_manager_names_[i], - entry) != 0) - ACE_THROW (Deployment::StartError ()); // Should never happen! - - // @@TODO: This might cause problem! - ::Deployment::NodeApplication_var my_na = - (entry->int_id_).node_application_.in (); - - my_na->start (ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::start\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; - - ACE_CHECK_RETURN (0); -} - -void -CIAO::DomainApplicationManager_Impl:: -destroyApplication (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::StopError)) -{ - ACE_TRY - { - // Invoke destroyManager() operation on each cached - // NodeManager object. - for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i) - { - // Get the NodeManager and NodeApplicationManager object references. - ACE_Hash_Map_Entry - <ACE_CString, - Chained_Artifacts> *entry; - - if (this->artifact_map_.find (this->node_manager_names_[i], - entry) != 0) - ACE_THROW (Deployment::StopError ()); // Should never happen! - - ::Deployment::NodeApplicationManager_ptr my_node_application_manager = - (entry->int_id_).node_application_manager_.in (); - - // Invoke destoryApplication() operation on the NodeApplicationManger. - // Since we have the first arg is not used by NAM anyway. - my_node_application_manager->destroyApplication (0 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::destroyApplication\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; - - ACE_CHECK; -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -void -CIAO::DomainApplicationManager_Impl:: -destroyManager (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StopError)) -{ - ACE_TRY - { - for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i) - { - // Get the NodeManager and NodeApplicationManager object references. - ACE_Hash_Map_Entry - <ACE_CString, - Chained_Artifacts> *entry; - - if (this->artifact_map_.find (this->node_manager_names_[i], - entry) != 0) - ACE_THROW (Deployment::StopError ()); // Should never happen! - - ::Deployment::NodeManager_var my_node_manager = - (entry->int_id_).node_manager_; - - // Since we have the first arg is not used by NM anyway. - my_node_manager->destroyManager (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::destroyManager\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; - - ACE_CHECK; -} - -// Returns the DeploymentPlan associated with this ApplicationManager. -::Deployment::DeploymentPlan * -CIAO::DomainApplicationManager_Impl:: -getPlan (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - Deployment::DeploymentPlan_var plan = 0; - // Make a deep copy of the Plan - ACE_NEW_THROW_EX (plan, - Deployment::DeploymentPlan (this->plan_), - CORBA::NO_MEMORY ()); - - // Transfer ownership - return plan._retn (); -} - -Deployment::Connections * -CIAO::DomainApplicationManager_Impl:: -get_outgoing_connections (const Deployment::DeploymentPlan &plan) -{ - Deployment::Connections_var connections; - ACE_NEW_RETURN (connections, - Deployment::Connections, - 0); - - // For each component instance in the child plan ... - for (CORBA::ULong i = 0; i < plan.instance.length (); ++i) - { - // Get the component instance name - if (!get_outgoing_connections_i (plan.instance[i].name.in (), - connections.inout ())) - return 0; - } - return connections._retn (); -} - -bool -CIAO::DomainApplicationManager_Impl:: -get_outgoing_connections_i (const char * instname, - Deployment::Connections & retv) -{ - // Search in all the connections in the plan. - for (CORBA::ULong i = 0; i < this->plan_.connection.length(); ++i) - { - CORBA::ULong len = retv.length (); - - // Current connection that we are looking at. - const Deployment::PlanConnectionDescription & curr_conn = - this->plan_.connection[i]; - - //The modeling tool should make sure there are always 2 endpoints - //in a connection. - const CORBA::ULong curr_conn_len = curr_conn.internalEndpoint.length (); - for (CORBA::ULong p_index = 0; - p_index < curr_conn_len; - ++p_index) - { - const Deployment::PlanSubcomponentPortEndpoint & endpoint = - curr_conn.internalEndpoint[p_index]; - - // If the component name matches the name of one of the - // endpoints in the connection. - if (ACE_OS::strcmp (this->plan_.instance[endpoint.instanceRef].name.in (), - instname) == 0 ) - { - //Look at the port kind to make sure it's what we are interested in. - if (endpoint.kind != Deployment::Facet && - endpoint.kind != Deployment::EventConsumer) - { - // The other endpoints in this connection is what we want. - CORBA::ULong index = (p_index +1)%2; - - //Cache the name of the other component for later usage (search). - ACE_CString name = - this->plan_.instance[curr_conn.internalEndpoint[index].instanceRef].name.in (); - - //Cache the name of the port from the other component for searching later. - ACE_CString port_name = - curr_conn.internalEndpoint[index].portName.in (); - - bool found = false; - - // Now we have to search in the received connections to get the objRef. - const CORBA::ULong all_conn_len = this->all_connections_->length (); - for (CORBA::ULong conn_index = 0; - conn_index < all_conn_len; - ++conn_index) - { - //ACE_DEBUG ((LM_DEBUG, "step4\n")); - - const Deployment::Connection curr_rev_conn = this->all_connections_[conn_index]; - - // We need to look at the instance name and the port name to confirm. - if (ACE_OS::strcmp (curr_rev_conn.instanceName.in (), - name.c_str ()) == 0 && - ACE_OS::strcmp (curr_rev_conn.portName.in (), - port_name.c_str ()) == 0) - { - //ACE_DEBUG ((LM_DEBUG, "step5\n")); - - retv.length (len+1); - retv[len].instanceName = instname; - retv[len].portName = endpoint.portName.in (); - retv[len].kind = endpoint.kind; - retv[len].endpoint = CORBA::Object::_duplicate(curr_rev_conn.endpoint.in ()); - ++len; - found = true; - break; // Since we know there is only 2 endpoints in a connection. - // so we dont have to worry about multiplex Receptacle etc. - } - } - - // We didnt find the counter part connection even we are sure there must be 1. - if (!found) return false; - break; // We know we have found the connection so even we are still on - // internalpoint 0 we can skip internalpoint 1. - } - } - } /* close for loop on internal endpoints */ - } /* close for loop on all connections in the plan */ - return 1; -} - -void -CIAO::DomainApplicationManager_Impl:: -dump_connections (const ::Deployment::Connections & connections) -{ - const CORBA::ULong conn_len = connections.length (); - for (CORBA::ULong i = 0; i < conn_len; ++i) - { - ACE_DEBUG ((LM_DEBUG, "instanceName: %s\n", connections[i].instanceName.in ())); - ACE_DEBUG ((LM_DEBUG, "portName: %s\n", connections[i].portName.in ())); - ACE_DEBUG ((LM_DEBUG, "portkind: ")); - switch (connections[i].kind) { - case Deployment::Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break; - case Deployment::SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break; - case Deployment::MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break; - case Deployment::EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break; - case Deployment::EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break; - case Deployment::EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break; - } - - // object reference. - ACE_DEBUG ((LM_DEBUG, "endpoint: \n")); - } -} diff --git a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.h b/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.h deleted file mode 100644 index 5f2a4aa6239..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.h +++ /dev/null @@ -1,295 +0,0 @@ -//================================================================== -/** - * @file DomainApplicationManager_Impl.h - * - * $Id$ - * - * This file contains implementation for the servant of - * Deployment::DomainApplicationManager. - * - * @author Gan Deng <gan.deng@vanderbilt.edu> - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * @author Tao Lu <lu@dre.vanderbilt.edu> - */ -//===================================================================== - -#ifndef CIAO_DOMAINAPPLICATIONMANAGER_IMPL_H -#define CIAO_DOMAINAPPLICATIONMANAGER_IMPL_H -#include /**/ "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#include "ace/Hash_Map_Manager.h" -#include "ace/Vector_T.h" -#include "ace/Functor.h" -#include "ace/OS_NS_string.h" -#include "DeploymentS.h" - -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/Valuetype_Adapter_Impl.h" - -#include "Deployment_Configuration.h" -#include "DomainApplicationManager_Export.h" -#include "ciao/CIAO_common.h" - -namespace CIAO -{ - /** - * @class DomainApplicationManager_Impl - * - * @brief A servant for the Deployment::DomainApplicationManager - * interface. The DomainApplicationManager is responsible for - * deploying an application on the domain level, i.e. across - * nodes. It specializes the ApplicationManager abstract interface. - */ - class DomainApplicationManager_Export DomainApplicationManager_Impl - : public virtual POA_Deployment::DomainApplicationManager, - public virtual PortableServer::RefCountServantBase - { - public: - /// Define the type which contains a list of DnC artifacts. - /// @@ Assumption: Each NodeApplicationManager create only one - /// NodeApplication when the startLaunch() operation is invoked, - /// which means all the nodes on that child plan are collocated in - /// the same process. - typedef struct _chained_artifacts - { - ::Deployment::NodeManager_var node_manager_; - ::Deployment::DeploymentPlan_var child_plan_; - ::Deployment::NodeApplicationManager_var node_application_manager_; - ::Deployment::NodeApplication_var node_application_; - } Chained_Artifacts; - - /// Constructor - DomainApplicationManager_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - Deployment::TargetManager_ptr manager, - const Deployment::DeploymentPlan &plan, - const char * deployment_file) - ACE_THROW_SPEC ((CORBA::SystemException)); - - - /*=========================================================== - * Below are helper methods for the DomainApplicationManager - * - *============================================================*/ - /** - * Initialize the DomainApplicationManager. - * (1) Set the total number of child plans. - * (2) Set the list of NodeManager names, which is an array of strings. - * The <node_manager_names> is a pointer to an array of ACE_CString - * objets, which is allocated by the caller and deallocated by the - * DomainApplicationManager destructor. - * (3) Check the validity of the deployment plan and the deployment - * information data file. - * (4) Call split_plan () member function. - * (5) Invoke all the preparePlan () operations on all the corresponding - * NodeManagers with child plans. - * - * - * @@ What else do we need to initialize here? - */ - void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::StartError, - Deployment::PlanError)); - - /** - * set_uuid method on the DomainApplicationManager assigns the - * UUID of the associated plan to this Manager. This helps in - * reverse lookup operations such as given a manager, obtaining - * the UUID associated. The get_uuid method is used in this case. - */ - void set_uuid (const char * uuid); - - const char * get_uuid () const; - - /*=========================================================== - * Below are operations from the DomainApplicationManager - * - *============================================================*/ - - /** - * Executes the application, but does not start it yet. Users can - * optionally provide launch-time configuration properties to - * override properties that are part of the plan. Raises the - * InvalidProperty exception if a configuration property is - * invalid. Raises the StartError exception if an error occurs - * during launching. Raises the ResourceNotAvailable exception if - * the commitResources parameter to the prepare operation of the - * ExecutionManager was true, if late resource allocation is used, - * and one of the requested resources is not available. - */ - virtual void - startLaunch (const ::Deployment::Properties & configProperty, - ::CORBA::Boolean start - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::ResourceNotAvailable, - ::Deployment::StartError, - ::Deployment::InvalidProperty)); - - /** - * The second step in launching an application in the - * domain-level. If the start parameter is true, the application - * is started as well. Raises the StartError exception if - * launching or starting the application fails. - */ - virtual void finishLaunch (::CORBA::Boolean start - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::StartError)); - - /** - * Starts the application. Raises the StartError exception if - * starting the application fails. - */ - virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::StartError)); - - /** - * Terminates a running application. Raises the StopError - * exception if an error occurs during termination. Raises the - * InvalidReference exception if the appliction referen is - * unknown. - */ - virtual void destroyApplication (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::StopError)); - - /** - * Returns the DeploymentPlan associated with this ApplicationManager. - */ - virtual ::Deployment::DeploymentPlan * getPlan (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /** - * This is a helper function to destroy the NodeAppManager. - * Since we don't want to do so in the destructor so we will - * ask the ExecutionManager to do this on us when the same IDL - * op invoked on it. This is part of the result for merging DAM - * with DA. - */ - virtual void destroyManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StopError)); - - protected: - /// Destructor - virtual ~DomainApplicationManager_Impl (void); - - /** - * (1) Parse the global deployment plan, get the total number of - * child plans included in the global plan, and get the list of - * names of NodeManagers for each child plan. - * (2) Check whether all the NodeManager names are present in the - * deployment information data file. - */ - bool get_plan_info (void); - - /** - * Split the global (domain-level) deployment plan to a set of - * local (node-level) deployment plans. The set of local plans - * are cached in the ACE hash map member variable. - * Also, fill in the <node_manager_> field of the Chained_Artifacts - * struct. - */ - int split_plan (void); - - - /** - * Cache the incoming connections, which is a sequence of Connections, - * into the <all_connections_> list. - */ - void add_connections (const Deployment::Connections & incoming_conn); - - /** - * Given a child deployment plan, find the <Connections> sequence - * of the "providedReference" for the component instances in the - * child deployment plan as Receiver side. - */ - Deployment::Connections * - get_outgoing_connections (const Deployment::DeploymentPlan &plan); - - /// This is a helper function to find the connection for a component. - bool - get_outgoing_connections_i (const char * instname, - Deployment::Connections & retv); - - /// Dump connections, a static method - static void dump_connections (const ::Deployment::Connections & connections); - - protected: - /// location of the Domainapplication - CORBA::String_var domainapp_path_; - - /// Keep a pointer to the managing ORB serving this servant. - CORBA::ORB_var orb_; - - /// Keep a pointer to the managing POA. - PortableServer::POA_var poa_; - - /// Cache a object reference to this servant. - /// Deployment::DomainApplicationManager_var objref_; - - /// Cache the ior of the previous reference - CORBA::String_var ior_; - - /// Cached TargetManager. - Deployment::TargetManager_var target_manager_; - - /// Cached deployment plan for the particular domain. - /// The plan will be initialized when init is called. - Deployment::DeploymentPlan plan_; - - /// Cached child plans. - //Deployment::DeploymentPlan * child_plan_; - - /// Total number of child deployment plans. - size_t num_child_plans_; - - /// The list of node manager names, each of them - /// corresponds to one child plan. - ACE_Vector<ACE_CString> node_manager_names_; - - /// Cached information for NodeManager, NodeApplicationManager, - /// NodeApplication, Connections, etc. - /// Key: NodeManager name with CString type. - /// Value: Chained_Artifacts struct type. - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - Chained_Artifacts, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> Chained_Artifacts_Table; - - Chained_Artifacts_Table artifact_map_; - - /// The deployment information data file. - const char * deployment_file_; - - /// Deployment Configuration info, which contains the deployment topology. - Deployment_Configuration deployment_config_; - - /// UUID from the Plan - CORBA::String_var uuid_; - - /// Maintain a list of <Connections>, each of which is obtained by - /// calling the startLaunch() method on the NodeApplicationManager object. - ::Deployment::Connections_var all_connections_; - - }; -} - -#if defined (__ACE_INLINE__) -# include "DomainApplicationManager_Impl.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" -#endif /* CIAO_DOMAINAPPLICATIONMANAGER_IMPL_H */ diff --git a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.inl b/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.inl deleted file mode 100644 index b50adfbc712..00000000000 --- a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager_Impl.inl +++ /dev/null @@ -1,16 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -ACE_INLINE const char * -CIAO::DomainApplicationManager_Impl::get_uuid () const -{ - return this->uuid_; -} - -ACE_INLINE void -CIAO::DomainApplicationManager_Impl::set_uuid (const char * uuid) -{ - // Copy this uuid reference - this->uuid_ = CORBA::string_dup (uuid); -} diff --git a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.idl b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.idl deleted file mode 100644 index cdd47c24d1b..00000000000 --- a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.idl +++ /dev/null @@ -1,26 +0,0 @@ -// $Id$ - -/** - * @file ExecutionManager.idl - * - * @brief Simple interface to control the ExecutionManager. This - * interface currently provides an additional method called shutdown - * to terminate the process cleanly. - * - */ - -#include "Deployment.idl" - -module CIAO -{ - /** - * @brief CIAO Execution Manager Program - * - * This feature addition is added using inheritance mechanism currently - */ - interface ExecutionManagerDaemon : Deployment::ExecutionManager - { - // Shutdown the daemon process. - oneway void shutdown (); - }; -}; diff --git a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.mpc b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.mpc deleted file mode 100644 index 067cad1415d..00000000000 --- a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.mpc +++ /dev/null @@ -1,31 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project (ExecutionManager_stub): ciao_deployment_stub, ciao_server_dnc { - sharedname = ExecutionManager_stub - idlflags += -Wb,stub_export_macro=ExecutionManager_stub_Export -Wb,stub_export_include=ExecutionManager_stub_export.h - dynamicflags = EXECUTIONMANAGER_STUB_BUILD_DLL - - IDL_Files { - ExecutionManager.idl - } - - Source_Files { - ExecutionManagerC.cpp - } -} - -project(Execution_Manager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_stub, iortable, naming { - exename = Execution_Manager - after += DomainApplicationManager ExecutionManager_stub - libs += DomainApplicationManager ExecutionManager_stub TAO_IFR_Client - - IDL_Files { - } - - Source_Files { - ExecutionManagerS.cpp - Execution_Manager.cpp - ExecutionManager_Impl.cpp - } -} diff --git a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.cpp b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.cpp deleted file mode 100644 index 65c3ccf99e9..00000000000 --- a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ExecutionManager_Impl.h" - -CIAO::ExecutionManager_Impl::ExecutionManager_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - const char * init_file - ACE_ENV_ARG_DECL) - : orb_ (CORBA::ORB::_duplicate (orb)), - poa_ (PortableServer::POA::_duplicate (poa)), - init_file_ (init_file), - dam_servant_ (0) -{ -} - -CIAO::ExecutionManager_Impl::~ExecutionManager_Impl () -{ - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_DEBUG, "ExecutionManager Dtor\n")); -} - -Deployment::DomainApplicationManager_ptr -CIAO::ExecutionManager_Impl:: -preparePlan (const Deployment::DeploymentPlan &plan, - CORBA::Boolean - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::PlanError, - Deployment::StartError - )) -{ - // As DAnCE currently supports only one domain for now, we return the same - // DomainApplicationManager for multiple calls to prepare plan - - if (this->dam_servant_ == 0) - { - // Create a new DomainApplicationMananager servant - ACE_NEW_THROW_EX (this->dam_servant_, - CIAO::DomainApplicationManager_Impl - (this->orb_.in (), - this->poa_.in (), - Deployment::TargetManager::_nil (), - plan, - this->init_file_.c_str ()), - CORBA::NO_MEMORY ()); - - ACE_CHECK_RETURN (Deployment::DomainApplicationManager::_nil()); - - /** - *=================================================================== - * MAIN STEP: This call parses the deployment plan, generates the Node - * specific plan and starts the deployment process - *=================================================================== - */ - this->dam_servant_->init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (Deployment::DomainApplicationManager::_nil()); - - this->dam_servant_->set_uuid (plan.UUID.in ()); - - // Register with our POA and activate the object. - PortableServer::ObjectId_var oid - = this->poa_->activate_object (this->dam_servant_.in () - ACE_ENV_ARG_PARAMETER); - - ACE_CHECK_RETURN (Deployment::DomainApplicationManager::_nil ()); - - // Get the reference of the object. - CORBA::Object_var objref - = this->poa_->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Deployment::DomainApplicationManager::_nil ()); - - this->dam_ = - Deployment::DomainApplicationManager::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Deployment::DomainApplicationManager::_nil ()); - } - - // Return the ApplicationManager instance - return Deployment::DomainApplicationManager::_duplicate (this->dam_.in ()); -} - -Deployment::DomainApplicationManagers * -CIAO::ExecutionManager_Impl::getManagers (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Initialize the list of DomainApplication Managers - Deployment::DomainApplicationManagers_var list; - ACE_NEW_THROW_EX (list, - Deployment::DomainApplicationManagers, - CORBA::NO_MEMORY()); - ACE_CHECK_RETURN (0); - - // Add the manager to the list - CORBA::ULong index = list->length (); - list->length (index + 1); - list [index] = - Deployment::DomainApplicationManager::_duplicate (this->dam_.in ()); - return list._retn (); -} - -void -CIAO::ExecutionManager_Impl::destroyManager (Deployment::DomainApplicationManager_ptr manager - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StopError)) -{ - ACE_UNUSED_ARG (manager); - //if (CORBA::is_nil (manager)) - // ACE_THROW (Deployment::StopError ()); - - ACE_TRY - { - PortableServer::ObjectId_var oid - = this->poa_->reference_to_id (this->dam_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->dam_servant_->destroyManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->poa_->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); - - // set it to zero to force it to be in a consistent - // state. - this->dam_servant_ = 0; - this->dam_ = Deployment::DomainApplicationManager::_nil (); - - ACE_TRY_CHECK; - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "ExecutionManager_Impl::destroyManager\t\n"); - ACE_THROW (Deployment::StopError ()); - } - - ACE_ENDTRY; -} - -void -CIAO::ExecutionManager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // @@ (OO) You're using the wrong emulated exception macro below. - // Please use ACE_ENV_ARG_PARAMETER instead. - - // Shutdown the ORB on which it is runing - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.h b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.h deleted file mode 100644 index 619d5d7f3ac..00000000000 --- a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.h +++ /dev/null @@ -1,131 +0,0 @@ -/*======================================================================= - * - * @file ExecutionManager_Impl.h - * - * $Id$ - * - * @brief This file contains implementation for - * Deployment::ExecutionManager interface. - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * @auther Tao Lu <lu@dre.vanderbilt.edu> - * - *======================================================================*/ - -#ifndef EXECUTIONMANAGER_IMPL_H -#define EXECUTIONMANAGER_IMPL_H - -#include "ExecutionManagerS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "ace/Hash_Map_Manager.h" -#include "tao/Utils/Servant_Var.h" -#include "DomainApplicationManager/DomainApplicationManager_Impl.h" - -/** - * - * @class ExecutionManager_Impl - * - * @brief This class implements the ExecutionManger. ExecutionManager starts - * the execution process after the planning stage. - * - * Serval assumptions I made now: - * - * 1. There is an ExecutionManager per application. => AssemblyFactory - * 2. This interface will be brought up at or before the actual execution - * of an application starts. - * 3. No XML parsing is be done in this interface, the requrest will be - * forwarded to the DomainApplicationManager. - * - */ -namespace CIAO -{ - class ExecutionManager_Impl - : public virtual POA_CIAO::ExecutionManagerDaemon, - public virtual PortableServer::RefCountServantBase - { - - public: - /// Constructor. - ExecutionManager_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - const char * init_file - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - /// Generate an ApplicationManager factory. - virtual Deployment::DomainApplicationManager_ptr - preparePlan - ( - const Deployment::DeploymentPlan & plan, - CORBA::Boolean commitResources - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::PlanError, - Deployment::StartError - )); - - /// Return a set of the currently held DomainApplicationMnager. - virtual Deployment::DomainApplicationManagers * - getManagers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Destroy a specific manager. - virtual void - destroyManager - ( - Deployment::DomainApplicationManager_ptr manager - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - Deployment::StopError - )); - - virtual void - shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - protected: - /*typedef - ACE_Hash_Map_Manager_Ex - < ACE_CString, - Deployment::DomainApplicationManager_var, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - TAO_SYNCH_MUTEX - > - Table; - typedef Table::iterator Iterator; - */ - - /// Destructor. - ~ExecutionManager_Impl (); - - /// Cached ORB pointer - CORBA::ORB_var orb_; - - /// Cached POA pointer - PortableServer::POA_var poa_; - - // Internal Hashtable - // Table table_; - - // Path to the initialization file - ACE_CString init_file_; - - Deployment::DomainApplicationManager_var dam_; - - /// Cached servant of the DomainApplicaitonmanager. - TAO::Utils::Servant_Var<CIAO::DomainApplicationManager_Impl> dam_servant_; - }; - -}; - -#include /**/ "ace/post.h" -#endif /* EXECUTIONMANAGER_IMPL_H */ diff --git a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.inl b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.inl deleted file mode 100644 index 7325e38ec1d..00000000000 --- a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_Impl.inl +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ diff --git a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_stub_export.h b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_stub_export.h deleted file mode 100644 index f32c91c5e6e..00000000000 --- a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ExecutionManager_stub -// ------------------------------ -#ifndef EXECUTIONMANAGER_STUB_EXPORT_H -#define EXECUTIONMANAGER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (EXECUTIONMANAGER_STUB_HAS_DLL) -# define EXECUTIONMANAGER_STUB_HAS_DLL 1 -#endif /* ! EXECUTIONMANAGER_STUB_HAS_DLL */ - -#if defined (EXECUTIONMANAGER_STUB_HAS_DLL) && (EXECUTIONMANAGER_STUB_HAS_DLL == 1) -# if defined (EXECUTIONMANAGER_STUB_BUILD_DLL) -# define ExecutionManager_stub_Export ACE_Proper_Export_Flag -# define EXECUTIONMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define EXECUTIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* EXECUTIONMANAGER_STUB_BUILD_DLL */ -# define ExecutionManager_stub_Export ACE_Proper_Import_Flag -# define EXECUTIONMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define EXECUTIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* EXECUTIONMANAGER_STUB_BUILD_DLL */ -#else /* EXECUTIONMANAGER_STUB_HAS_DLL == 1 */ -# define ExecutionManager_stub_Export -# define EXECUTIONMANAGER_STUB_SINGLETON_DECLARATION(T) -# define EXECUTIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* EXECUTIONMANAGER_STUB_HAS_DLL == 1 */ - -// Set EXECUTIONMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (EXECUTIONMANAGER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define EXECUTIONMANAGER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define EXECUTIONMANAGER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !EXECUTIONMANAGER_STUB_NTRACE */ - -#if (EXECUTIONMANAGER_STUB_NTRACE == 1) -# define EXECUTIONMANAGER_STUB_TRACE(X) -#else /* (EXECUTIONMANAGER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define EXECUTIONMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (EXECUTIONMANAGER_STUB_NTRACE == 1) */ - -#endif /* EXECUTIONMANAGER_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DnC/ExecutionManager/Execution_Manager.cpp deleted file mode 100644 index 1815533921c..00000000000 --- a/TAO/CIAO/DnC/ExecutionManager/Execution_Manager.cpp +++ /dev/null @@ -1,230 +0,0 @@ -//--*C++*-- - -//============================================================== -/** - * @file Execution_Manager.cpp - * - * @brief CIAO's Execution Manager implementation - * - * $Id$ - * - * ExecutionManager is the DnC entity which is the starting point for - * the deployment process. This entity collaborates with other entities - * including Logging Facility, TargetManager, and - * DomainApplicationManager entities to facilitate the deployment and - * launching of components. In our current design, the ExecutionManager - * is started as an executable on a give host and registered with the - * name service. The Executor/client obtains this reference and starts - * the deployment process. - * - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * @author Tao Lu <lu@dre.vanderbilt.edu> - */ -//=============================================================== - -#include "ExecutionManager_Impl.h" -#include "Server_init.h" -#include "tao/IORTable/IORTable.h" - -// Include Name Service header -#include "orbsvcs/orbsvcs/CosNamingC.h" - -#include "ace/SString.h" -#include "ace/Read_Buffer.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_unistd.h" - -const char *ior_file_name_ = "executionManager.ior"; -char * default_svcconf_ = 0; -char * svcconf_config_ = 0; -char * name = "ExecutionManager"; -char * init_file_name = "deployment.dat"; - -int write_to_ior_ = 0; -int register_with_ns_ = 0; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:c:m:i:n"); - int c; - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': // get the file name to write to - ior_file_name_ = get_opts.opt_arg (); - write_to_ior_ = 1; - break; - - case 'c': // get the default svc.conf filename - default_svcconf_ = get_opts.opt_arg (); - break; - - case 'i': // get the svc.conf map configuration filename - init_file_name = get_opts.opt_arg (); - break; - - case 'n': - register_with_ns_ = 1; - break; - - case '?': // display help for use of the server. - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-o <ior_output_file>\n" - "-c <svc.conf file>\n" - "-i <installation data filename>\n" - "-n <use naming service>\n" - "\n", - argv [0]), - -1); - } - - return 0; -} - -int -write_IOR(const char* ior) -{ - FILE* ior_output_file_ = - ACE_OS::fopen (ior_file_name_, "w"); - - if (ior_output_file_) - { - ACE_OS::fprintf (ior_output_file_, - "%s", - ior); - ACE_OS::fclose (ior_output_file_); - } - - return 0; -} - -int -register_with_ns (const char * name_context, - CORBA::ORB_ptr orb, - CIAO::ExecutionManagerDaemon_ptr obj) -{ - // Naming Service related operations - CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService"); - - CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_context_object.in ()); - - // Initialize the Naming Sequence - CosNaming::Name name (1); - name.length (1); - // Register the name with the NS - name[0].id = CORBA::string_dup (name_context); - - // Register the servant with the Naming Service - naming_context->bind (name, obj); - - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return -1; - - // Get reference to Root POA. - CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POA_var poa - = PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (adapter.in ())) - ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1); - - // Create and install the CIAO Daemon servant - CIAO::ExecutionManager_Impl *daemon_servant = 0; - ACE_NEW_RETURN (daemon_servant, - CIAO::ExecutionManager_Impl(orb.in (), - poa.in (), - init_file_name), - -1); - - // Implicit activation - PortableServer::ServantBase_var safe_daemon (daemon_servant); - CIAO::ExecutionManagerDaemon_var daemon = daemon_servant->_this (); - - // Now register daemon with IOR table and write its IOR. - CORBA::String_var str = orb->object_to_string (daemon.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - adapter->bind ("ExecutionManager", str.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (write_to_ior_) - write_IOR (str.in ()); - else if (register_with_ns_) - { - // Register this name with the Naming Service - register_with_ns (name, orb.in (), daemon.in ()); - } - - ACE_DEBUG ((LM_INFO, "CIAO_ExecutionMananger IOR: %s\n", str.in ())); - - // Activate POA manager - PortableServer::POAManager_var mgr - = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - // End Deployment part - ACE_DEBUG ((LM_DEBUG, - "CIAO_ExecutionManager is running...\n")); - - // Run the main event loop for the ORB. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK - - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO_ExecutionManager::main\t\n"); - return 1; - } - ACE_ENDTRY; - - ACE_DEBUG ((LM_DEBUG, - "CIAO_ExecutionManager has closed\n")); - return 0; -} diff --git a/TAO/CIAO/DnC/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DnC/NodeApplication/NodeApplication.cpp deleted file mode 100644 index 945f8312f2a..00000000000 --- a/TAO/CIAO/DnC/NodeApplication/NodeApplication.cpp +++ /dev/null @@ -1,231 +0,0 @@ -// $Id$ - -/** - * @file NodeApplication.cpp - * - * @brief CIAO's NodeApplication implementation - * - */ - -#include "NodeApplication_Impl.h" -#include "NodeApplication_CallBackC.h" -#include "ciao/Server_init.h" -#include "ciao/CIAO_common.h" -#include "ace/SString.h" -#include "ace/Get_Opt.h" -#include "ace/Env_Value_T.h" -#include "ace/Sched_Params.h" -#include "ace/OS_NS_errno.h" - -char *ior_file_name_ = 0; -char *callback_ior_ = 0; -int use_callback = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "nk:o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'n': - use_callback = 0; - break; - - case 'o': // get the file name to write to - ior_file_name_ = get_opts.opt_arg (); - break; - - case 'k': // get the activator callback IOR - callback_ior_ = get_opts.opt_arg (); - break; - - case '?': // display help for use of the server. - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-n Do not use Callback (for testing)\n" - "-o <ior_output_file>\n" - "-k <NodeApplicationManager_callback_ior>\n" - "\n", - argv [0]), - -1); - } - - if (use_callback && callback_ior_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, "Callback IOR to NodeApplicationManager is required.\n"), - -1); - - return 0; -} - -int -main (int argc, char *argv[]) -{ - //@@ I will ignor this config done at WashU for now. --Tao - // Define CIAO_FIFO_SCHED=1 to run component server in FIFO_SCHED class - /* ACE_Env_Value<int> envar ("CIAO_FIFO_SCHED", 0); - if (envar != 0) - { - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "ComponentServer (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "ComponentServer (%P|%t): sched_params failed\n")); - } - }*/ - - ACE_TRY_NEW_ENV - { - // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CIAO::Server_init (orb.in ()); - - if (parse_args (argc, argv) != 0) - return -1; - - // Get reference to Root POA. - CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POA_var poa - = PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Activate POA manager - PortableServer::POAManager_var mgr - = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CIAO::NodeApplication_Impl *nodeapp_servant; - - ACE_NEW_RETURN (nodeapp_servant, - CIAO::NodeApplication_Impl (orb.in (), - poa.in ()), - -1); - - PortableServer::ServantBase_var safe_servant (nodeapp_servant); - - // CONFIGURING NodeApplication - PortableServer::ObjectId_var nodeapp_oid - = poa->activate_object (nodeapp_servant - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - obj = poa->id_to_reference (nodeapp_oid.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Deployment::NodeApplication_var nodeapp_obj = - Deployment::NodeApplication::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (nodeapp_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to activate NodeApplication object\n"), - -1); - - - Deployment::NodeApplicationManager_var nodeapp_man; - Deployment::Properties_var prop = new Deployment::Properties; - - if (use_callback) - { - obj = orb->string_to_object (callback_ior_ - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CIAO::NodeApplication_Callback_var nam_callback - = CIAO::NodeApplication_Callback::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Deployment::Properties_out properties_out (prop.out ()); - - nodeapp_man - = nam_callback->register_node_application (nodeapp_obj.in (), - properties_out - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - /** @@ We need to call NodeApplication servant's init method. - * But it's not sure to me where exactly we can get the - * Properties needed by the init method at this moment. There are two - * ways to set the property of the NodeApplication: - * 1. call init remotely from NodeApplicationManager - * 2. call init locally on the servant of NodeApplication. - */ - - if (nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER)) - { - ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\ - initializing the session container!")); - return 1; - } - ACE_TRY_CHECK; - - CORBA::String_var str = orb->object_to_string (nodeapp_obj.in () - ACE_ENV_ARG_PARAMETER); - - CIAO::Utility::write_IOR (ior_file_name_, str.in ()); - - // End Deployment part - if (CIAO::debug_level () > 10) - { - ACE_DEBUG ((LM_INFO, "NodeApplication IOR: %s\n", str.in ())); - - ACE_DEBUG ((LM_DEBUG, - "Running NodeApplication...\n")); - } - - // Run the main event loop for the ORB. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApp::main\t\n"); - return 1; - } - ACE_ENDTRY; - - ACE_DEBUG ((LM_DEBUG, "This NodeApplication is quitting now!\n")); - return 0; -} diff --git a/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc deleted file mode 100644 index ab573cf44d0..00000000000 --- a/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc +++ /dev/null @@ -1,13 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(NodeApplication): ciao_server_dnc, ciao_deployment_stub { - exename = NodeApplication - - IDL_Files { - } - - Source_Files { - NodeApplication.cpp - } -} diff --git a/TAO/CIAO/DnC/NodeApplicationManager/CIAO_NAM_Export.h b/TAO/CIAO/DnC/NodeApplicationManager/CIAO_NAM_Export.h deleted file mode 100644 index bdeb544afc4..00000000000 --- a/TAO/CIAO/DnC/NodeApplicationManager/CIAO_NAM_Export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_NAM -// ------------------------------ -#ifndef CIAO_NAM_EXPORT_H -#define CIAO_NAM_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (CIAO_NAM_HAS_DLL) -# define CIAO_NAM_HAS_DLL 1 -#endif /* ! CIAO_NAM_HAS_DLL */ - -#if defined (CIAO_NAM_HAS_DLL) && (CIAO_NAM_HAS_DLL == 1) -# if defined (CIAO_NAM_BUILD_DLL) -# define CIAO_NAM_Export ACE_Proper_Export_Flag -# define CIAO_NAM_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_NAM_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_NAM_BUILD_DLL */ -# define CIAO_NAM_Export ACE_Proper_Import_Flag -# define CIAO_NAM_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_NAM_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_NAM_BUILD_DLL */ -#else /* CIAO_NAM_HAS_DLL == 1 */ -# define CIAO_NAM_Export -# define CIAO_NAM_SINGLETON_DECLARATION(T) -# define CIAO_NAM_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_NAM_HAS_DLL == 1 */ - -// Set CIAO_NAM_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_NAM_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_NAM_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_NAM_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_NAM_NTRACE */ - -#if (CIAO_NAM_NTRACE == 1) -# define CIAO_NAM_TRACE(X) -#else /* (CIAO_NAM_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_NAM_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_NAM_NTRACE == 1) */ - -#endif /* CIAO_NAM_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/NodeApplicationManager/ImplementationInfo.cpp b/TAO/CIAO/DnC/NodeApplicationManager/ImplementationInfo.cpp deleted file mode 100644 index e3393d17f61..00000000000 --- a/TAO/CIAO/DnC/NodeApplicationManager/ImplementationInfo.cpp +++ /dev/null @@ -1,126 +0,0 @@ -//$Id$ -#ifndef CIAO_IMPLEMENTATION_INFO_C -#define CIAO_IMPLEMENTATION_INFO_C - -#include "ImplementationInfo.h" - -// Specialized operation that we will use for now. -namespace CIAO -{ - bool operator<< (Deployment::ImplementationInfos & info, - const Deployment::DeploymentPlan & plan) - { - // @@ (OO) Since leng is a constant, please declare it as such, - // i.e. "const CORBA::ULong len = ...", to improve "const - // correctness". - const CORBA::ULong len = plan.instance.length (); - info.length (len); - - for (CORBA::ULong i = 0; i < len; ++i) - { - const Deployment::InstanceDeploymentDescription & inst = - plan.instance[i]; - - // Get the component instance name. - info[i].component_instance_name = inst.name.in (); - - const Deployment::MonolithicDeploymentDescription & impl = - plan.implementation[inst.implementationRef]; - - const CORBA::ULong artifact_num = impl.artifactRef.length (); - - // Copy Component instance related Properties if there is any. - if (inst.configProperty.length () > 0) - { - info[i].component_config = inst.configProperty; - } - - // For svnt artifact - for (CORBA::ULong j = 0; j < artifact_num; ++j) - { - const Deployment::ArtifactDeploymentDescription & arti = - plan.artifact[ impl.artifactRef[j] ]; - - ACE_CString tmp = arti.name.in (); - ssize_t pos; - - //@@ Note: I am not checking for redundancy here. Maybe - // the modeling tool should make sure of - // uniqueness. - if ((pos = tmp.find ("_svnt")) != ACE_CString::npos || - (pos = tmp.find ("_Svnt")) != ACE_CString::npos) - { - if (arti.location.length() < 1 ) - { - ACE_DEBUG ((LM_DEBUG, "Servant Artifact must have a location!\n")); - return 0; - } - // Cpoy the servant dll/so name. - // @@ Note: I ignore all the other locations except the first one. - info[i].servant_dll = CORBA::string_dup (arti.location[0].in ()); - - // Get the entry point. - const CORBA::ULong prop_length = arti.execParameter.length (); - for (CORBA::ULong prop_num = 0; - prop_num < prop_length; - ++prop_num) - { - ACE_CString name (arti.execParameter[prop_num].name.in ()); - if (name == ACE_CString ("entryPoint")) - { - const char * entry; - (arti.execParameter[prop_num].value) >>= entry; - info[i].servant_entrypt = CORBA::string_dup (entry); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Found unknown property in the artifact!\n")); - ACE_DEBUG ((LM_DEBUG, "We only support entrypoint at this point in CIAO.\n")); - } - } - } - // As one can see, code is duplicated here. I will come back for this later. - // For exec artifact - if ((pos = tmp.find ("_exec")) != ACE_CString::npos || - (pos = tmp.find ("_Exec")) != ACE_CString::npos) - { - if (arti.location.length() < 1 ) - { - ACE_DEBUG ((LM_DEBUG, "Executor Artifact must have a location!\n")); - return 0; - } - // Cpoy the servant dll/so name. - // @@ Note: I ignore all the other locations except the first one. - info[i].executor_dll = CORBA::string_dup (arti.location[0].in ()); - - // Get the entry point. - const CORBA::ULong prop_length = arti.execParameter.length (); - for (CORBA::ULong prop_num = 0; - prop_num < prop_length; - ++prop_num) - { - ACE_CString name (arti.execParameter[prop_num].name.in ()); - if (name == ACE_CString ("entryPoint")) - { - const char * entry; - (arti.execParameter[prop_num].value) >>= entry; - info[i].executor_entrypt = CORBA::string_dup (entry); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Found unknown property in the artifact!\n")); - ACE_DEBUG ((LM_DEBUG, "We only support entrypoint at this point in CIAO.\n")); - } - } - } - - else - // We see artifact other than servant/executor and we ignore them. - continue; - } - } - return 1; - } -} - -#endif /* CIAO_IMPLEMENTATION_INFO_C */ diff --git a/TAO/CIAO/DnC/NodeApplicationManager/ImplementationInfo.h b/TAO/CIAO/DnC/NodeApplicationManager/ImplementationInfo.h deleted file mode 100644 index 5bd6c8022ca..00000000000 --- a/TAO/CIAO/DnC/NodeApplicationManager/ImplementationInfo.h +++ /dev/null @@ -1,73 +0,0 @@ -//$Id$ -/* -*- C++ -*- */ -/*************************************************************** - * @file ImplementationInfo.h - * - * @brief This file defines some helper functions for paring the - * Component ImplementationInfo and properties from - * the plan. - * - * @author Tao Lu <lu@dre.vanderbilt.edu> - ***************************************************************/ - -#ifndef IMPLEMENTATIONIFO_H -#define IMPLEMENTATIONIFO_H -#include /**/ "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -//#include "Deployment_CoreS.h" -//#include "ace/os_types.h" -#include "ciao/DeploymentC.h" - -//@@ I wish we could have precompiled header support soon!!! - -// This mthod is a helper function to parse the plan into the -// ImplementationInfo struct. - -namespace CIAO -{ - bool operator<<(Deployment::ImplementationInfos & info, - const Deployment::DeploymentPlan & plan); -} - -/* -// Helper function to parse the property. -template < typename OUTPUT> -bool operator<< (OUTPUT & info, - const Deployment::Property & property); - -// Sepcialized for the entry point property -template < > -bool operator<< < TAO_String_Manager> - (TAO_String_Manager & info, - const Deployment::Property & property) -{ - const char * tmp; - if (property.value >>= tmp) - info = CORBA::string_duplicate (tmp); - else - { - ACE_DEBUG ((LM_DEBUG, "Property::value >>= TAO_String_Manager failed!\n")); - return 0; - } - - return 1; -} -*/ - -//#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -//#include "ImplementationInfo.cpp" -//#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -//#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -//#pragma implementation ("ImplementationInfo.cpp") -//#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - - -#include /**/ "ace/post.h" -#endif /* IMPLEMENTATIONIFO_H */ diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc deleted file mode 100644 index 0adbadae578..00000000000 --- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc +++ /dev/null @@ -1,14 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_stub { - - sharedname = NodeApplicationManager - idlflags += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export - dynamicflags = CIAO_NAM_BUILD_DLL - - Source_Files { - NodeApplicationManager_Impl.cpp - ImplementationInfo.cpp - } -} diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp deleted file mode 100644 index f0abf616576..00000000000 --- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ /dev/null @@ -1,367 +0,0 @@ -// $Id$ - -#include "NodeApplicationManager_Impl.h" -#include "ace/Process.h" -#include "ace/OS_NS_stdio.h" - -#if !defined (__ACE_INLINE__) -# include "NodeApplicationManager_Impl.inl" -#endif /* __ACE_INLINE__ */ -CIAO::NodeApplicationManager_Impl::~NodeApplicationManager_Impl () -{ -} - -Deployment::NodeApplicationManager_ptr -CIAO::NodeApplicationManager_Impl:: -init (const char *nodeapp_location, - const CORBA::ULong delay, - const Deployment::DeploymentPlan & plan, - const PortableServer::POA_ptr callback_poa - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::InvalidProperty)) -{ - ACE_TRY - { - if (nodeapp_location == 0) - ACE_THROW (CORBA::BAD_PARAM ()); - - if (spawn_delay_ == 0) - ACE_THROW (CORBA::BAD_PARAM ()); - - this->nodeapp_path_.set (nodeapp_location); - this->spawn_delay_ = delay; - - // Make a copy of the plan for later usage. - this->plan_ = plan; - - // Cache the call back POA for callback object. - this->callback_poa_ = PortableServer::POA::_duplicate (callback_poa); - - // Activate the ourself. - PortableServer::ObjectId_var oid - = this->poa_->activate_object (this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var obj = this->poa_->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // And cache the object reference. - this->objref_ = Deployment::NodeApplicationManager::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - //return this object reference - return Deployment::NodeApplicationManager::_duplicate (this->objref_.in ()); - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApplicationManager_Impl::init\t\n"); - ACE_RE_THROW; - } - - ACE_ENDTRY; -} - -void -CIAO::NodeApplicationManager_Impl:: -parse_config_value (ACE_CString & str - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::InvalidProperty)) -{ - // The unused arg is for future improvemnts. - ACE_UNUSED_ARG (str); - - ACE_THROW ( CORBA::NO_IMPLEMENT() ); -} - -Deployment::NodeApplication_ptr -CIAO::NodeApplicationManager_Impl:: -create_node_application (const ACE_CString & options - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError, - Deployment::InvalidProperty)) -{ - Deployment::NodeApplication_var retval; - Deployment::Properties_var prop; - - ACE_NEW_THROW_EX (prop, - Deployment::Properties, - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (Deployment::NodeApplication::_nil()); - - // @@ Create a new callback servant. - CIAO::NodeApplication_Callback_Impl * callback_servant = 0; - ACE_NEW_THROW_EX (callback_servant, - CIAO::NodeApplication_Callback_Impl (this->orb_.in (), - this->callback_poa_.in (), - this->objref_.in (), - prop.in ()), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (Deployment::NodeApplication::_nil()); - - PortableServer::ServantBase_var servant_var (callback_servant); - PortableServer::ObjectId_var cb_id - = this->callback_poa_->activate_object (callback_servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Deployment::NodeApplication::_nil()); - - ACE_Process node_application; - ACE_Process_Options p_options; - - ACE_TRY - { - CORBA::Object_var cb_obj = - this->callback_poa_->id_to_reference (cb_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CIAO::NodeApplication_Callback_var cb = - CIAO::NodeApplication_Callback::_narrow (cb_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var cb_ior = - this->orb_->object_to_string (cb.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // spawn the new NodeApplication. - p_options.command_line ("%s -k %s" - "%s", - this->nodeapp_path_.c_str (), - cb_ior.in (), - options.c_str ()); - - p_options.avoid_zombies (1); - - if (node_application.spawn (p_options) == -1) - { - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_ERROR, "Fail to spawn a NodeApplication process\n")); - - ACE_TRY_THROW (Components::CreateFailure ()); - } - - // wait for nodeApp to pass back its object reference. with a - // timeout value. using perform_work and stuff. - - int looping = 1; - - ACE_Time_Value timeout (this->spawn_delay_, 0); - - while (looping) - { - this->orb_->perform_work (timeout - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - retval = callback_servant->get_nodeapp_ref (); - - if (timeout == ACE_Time_Value::zero || !CORBA::is_nil (retval.in ())) - looping = 0; - } - - if (CORBA::is_nil (retval.in ())) - { - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_ERROR, "Fail to acquire the NodeApplication object\n")); - - ACE_TRY_THROW (Components::CreateFailure ()); - } - - { - //ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); - this->nodeapp_ = Deployment::NodeApplication::_duplicate (retval.in ()); - } - } - ACE_CATCHANY - { - this->callback_poa_->deactivate_object (cb_id.in ()); - ACE_TRY_CHECK; - - ACE_RE_THROW; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ()); - - this->callback_poa_->deactivate_object (cb_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ()); - - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_DEBUG, "CIAO::NodeApplicationManager_Impl::NodeApplication spawned!\n")); - - return retval._retn (); -} - -Deployment::Connections * -CIAO::NodeApplicationManager_Impl:: -create_connections (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::StartError, - Deployment::InvalidProperty)) -{ - Deployment::Connections_var retv; - - ACE_NEW_THROW_EX (retv, - Deployment::Connections (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - - CORBA::ULong len = retv->length (); - - const Component_Iterator end (this->component_map_.end ()); - for (Component_Iterator iter (this->component_map_.begin ()); - iter != end; - ++iter) - { - // Get all the facets first - Components::FacetDescriptions_var facets = - ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - // Get all the event consumers - Components::ConsumerDescriptions_var consumers = - ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - const CORBA::ULong facet_len = facets->length (); - const CORBA::ULong consumer_len = consumers->length (); - - retv->length (facet_len + consumer_len); - - CORBA::ULong i = 0; - for (i = 0; i < facet_len; ++i) - { - Deployment::Connection & conn = retv[len]; - conn.instanceName = (*iter).ext_id_.c_str (); - conn.portName = facets[i]->name (); - conn.kind = Deployment::Facet; - conn.endpoint = CORBA::Object::_duplicate (facets[i]->facet_ref ()); - ++len; - } - - for (i = 0; i < consumer_len; ++i) - { - Deployment::Connection & conn = retv[len]; - conn.instanceName = (*iter).ext_id_.c_str (); - conn.portName = consumers[i]->name (); - conn.kind = Deployment::EventConsumer; - conn.endpoint = CORBA::Object::_duplicate (consumers[i]->consumer ()); - ++len; - } - } - return retv._retn (); -} - -Deployment::Application_ptr -CIAO::NodeApplicationManager_Impl:: -startLaunch (const Deployment::Properties & configProperty, - Deployment::Connections_out providedReference, - CORBA::Boolean start - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::StartError, - Deployment::InvalidProperty)) -{ - ACE_UNUSED_ARG (configProperty); - ACE_UNUSED_ARG (start); - /** - * 1. First Map properties to TAO/CIAO specific property/configurations - * 2. Necessary property checking (needed?) - * 3. Call create_nade_application to spawn new process. - * 4. Initialize the NodeApplication. - * 5. get the provided connection endpoints back and return them. - */ - - Deployment::ImplementationInfos infos; - - if (!(infos << (this->plan_))) - { - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_DEBUG, "Failed to create Component Implementation Infos!\n")); - - ACE_THROW_RETURN (Deployment::StartError (), - Deployment::Application::_nil()); - } //@@ I am not sure about which exception to throw. I will come back to this. - - // Now spawn the NodeApplication process. - ACE_CString cmd_option (""); - Deployment::NodeApplication_var tmp = - create_node_application (cmd_option.c_str () ACE_ENV_ARG_PARAMETER); - - ACE_CHECK_RETURN (Deployment::Application::_nil()); - - // This is what we will get back, a sequence of compoent object refs. - Deployment::ComponentInfos_var comp_info; - - // For debugging. - if (CIAO::debug_level () > 1) - { - const CORBA::ULong info_len = infos.length (); - for (CORBA::ULong i = 0; i < info_len; ++i) - { - ACE_DEBUG ((LM_DEBUG, "The info for installation: \n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n", - infos[i].component_instance_name.in (), - infos[i].executor_dll.in (), - infos[i].executor_entrypt.in (), - infos[i].servant_dll.in (), - infos[i].servant_entrypt.in () )); - } - } - - // This will install all homes and components. - comp_info = this->nodeapp_->install (infos ACE_ENV_ARG_PARAMETER); - - ACE_CHECK_RETURN (Deployment::Application::_nil()); - - // Now fill in the map we have for the components. - const CORBA::ULong comp_len = comp_info->length (); - for (CORBA::ULong len = 0; - len < comp_len; - ++len) - { - //Since we know the type ahead of time...narrow is omitted here. - if (this->component_map_. - bind (comp_info[len].component_instance_name.in(), - Components::CCMObject::_duplicate (comp_info[len].component_ref.in()))) - ACE_THROW_RETURN (Deployment::StartError (), 0); - } - - providedReference = this->create_connections (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (Deployment::Application::_nil()); - - if (providedReference == 0) - ACE_THROW_RETURN (Deployment::StartError () , - Deployment::Application::_nil()); - - return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ()); -} - - -void -CIAO::NodeApplicationManager_Impl:: -destroyApplication (Deployment::Application_ptr app - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException - , Deployment::StopError)) -{ - ACE_UNUSED_ARG (app); - - //ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - //@@ Since we know there is only 1 nodeapp so the passed in - // parameter is ignored for now. - if (CORBA::is_nil (this->nodeapp_.in () )) - ACE_THROW (Deployment::StopError ()); - - this->nodeapp_->remove (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; -} diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.h deleted file mode 100644 index a9fd79bde39..00000000000 --- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.h +++ /dev/null @@ -1,182 +0,0 @@ -//$Id$ -// -*- C++ -*- - -//============================================================================= -/** - * @file NodeApplicationManager_Impl.h - * - * @author Tao Lu <lu@dre.vanderbilt.edu> - * - * This file contains implementation for the servant of - * Deployment::NodeApplicationManager. - */ -//============================================================================= - - -#ifndef CIAO_NODEAPPLICATIONMANAGER_IMPL_H -#define CIAO_NODEAPPLICATIONMANAGER_IMPL_H -#include /**/ "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/DeploymentS.h" -#include "CIAO_NAM_Export.h" -#include "ciao/NodeApp_CB_Impl.h" -#include "ImplementationInfo.h" -#include "ciao/CIAO_common.h" - -namespace CIAO -{ - /** - * @class NodeApplicationManager_Impl - */ - class CIAO_NAM_Export NodeApplicationManager_Impl - : public virtual POA_Deployment::NodeApplicationManager, - public virtual PortableServer::RefCountServantBase - { - public: - /// Constructor - NodeApplicationManager_Impl (CORBA::ORB_ptr o, - PortableServer::POA_ptr p); - - /*=========================================================== - * Below are operations from the NodeApplicationManager - * - *============================================================*/ - - //@@ The return type is NodeApplication_ptr actually. - virtual Deployment::Application_ptr - startLaunch (const Deployment::Properties & configProperty, - Deployment::Connections_out providedReference, - CORBA::Boolean start - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::StartError, - Deployment::InvalidProperty)); - - //@@ Destroy the whole applicaton. - virtual void destroyApplication (Deployment::Application_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StopError)); - - /** - * Initialize the NodeApplicationManager. The currently implementation - * of CIAO_NodeApplicationManager can only activate CIAO's own - * NodeApplication processes. You should specify the location - * (pathname) of the NodeApplication and the delay - * CIAO_NodeApplicationManager should wait (in second) for NodeApplication to - * call back. - * - * @param nodeapp_location A null-termiated char * string pointing - * to the pathname of a NodeApplication executable. - * - * @param delay instructs how long (in second) a CIAO_NodeApplicationManager - * should wait for a newly spawned NodeApplication to pass back - * its IOR. - * - * @param plan has all the information needed for the NodeAppManager to - * construct the application locally. Note, this includes the properties - * of the NodeApplication. For example, ORB config options etc. - * - * @param callback_poa contains child poa created for the callback interface. - * - * @return NodeApplicationManager_ptr. - **/ - virtual Deployment::NodeApplicationManager_ptr - init (const char *nodeapp_location, - const CORBA::ULong delay, - const Deployment::DeploymentPlan & plan, - const PortableServer::POA_ptr callback_poa - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::InvalidProperty)); - - //@@ Note: This method doesn't do duplicate. - Deployment::NodeApplicationManager_ptr get_nadeapp_manager (void); - - protected: - /// Destructor - virtual ~NodeApplicationManager_Impl (void); - - // Internal help function to create new NodeApplicationProcess - virtual Deployment::NodeApplication_ptr - create_node_application (const ACE_CString & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError, - Deployment::InvalidProperty)); - - // Helper function to get the connection. - virtual Deployment::Connections * - create_connections (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::ResourceNotAvailable, - Deployment::StartError, - Deployment::InvalidProperty)); - - /** - * Find the configurations in the plan and prepare them to pass to the - * NodeApplication, from command line probably. - */ - void parse_config_value (ACE_CString & str - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::InvalidProperty)); - - protected: - // location of the Nodeapplication - ACE_CString nodeapp_path_; - - // Keep a pointer to the managing ORB serving this servant. - CORBA::ORB_var orb_; - - // Keep a pointer to the managing POA. - PortableServer::POA_var poa_; - - // ObjectRef of ourself which will be needed by the callback - Deployment::NodeApplicationManager_var objref_; - - // Child poa that uses active object map. - PortableServer::POA_var callback_poa_; - - // Cache a object reference of the underlying NodeApplication - // Since I have decided to have only 1 NA in NAM so no map is needed. - Deployment::NodeApplication_var nodeapp_; - - // Cached plan (This should be the part of the whole plan local to this node) - // The plan will be initialized when init is called. - Deployment::DeploymentPlan plan_; - - // Specify the time in second NodeApplicationManager will wait for a - // child NodeApplication to callback. Default is 5 second. - CORBA::ULong spawn_delay_; - - // Extracted commandline options to pass to the NodeApplication. - CORBA::String_var nodeapp_command_op_; - - // A map of the component created on this node. - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - Components::CCMObject_var, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> CCMComponent_Map; - typedef CCMComponent_Map::iterator Component_Iterator; - CCMComponent_Map component_map_; - - // Synchronize access to the object set. - TAO_SYNCH_MUTEX lock_; - }; -} - -#if defined (__ACE_INLINE__) -# include "NodeApplicationManager_Impl.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" -#endif /* CIAO_NODEAPPLICATIONMANAGER_IMPL_H */ diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl deleted file mode 100644 index d11f60cb2c5..00000000000 --- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -CIAO::NodeApplicationManager_Impl:: -NodeApplicationManager_Impl (CORBA::ORB_ptr o, - PortableServer::POA_ptr p) - : orb_ (CORBA::ORB::_duplicate (o)), - poa_ (PortableServer::POA::_duplicate (p)), - callback_poa_ (PortableServer::POA::_nil ()), - spawn_delay_ (5) - // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet - // large. The maximum size of an ACE_Hash_Map_Manager is - // also fixed, i.e. it does not grow dynamically on demand. - // Make sure the default size of component_map_ is - // appropriate for your needs. You may also want to make - // the size configurable at compile-time, at least. -{ -} - -Deployment::NodeApplicationManager_ptr -CIAO::NodeApplicationManager_Impl:: -get_nadeapp_manager (void) -{ - return this->objref_; -} diff --git a/TAO/CIAO/DnC/NodeManager/NodeDaemon.idl b/TAO/CIAO/DnC/NodeManager/NodeDaemon.idl deleted file mode 100644 index e2079d5f4ef..00000000000 --- a/TAO/CIAO/DnC/NodeManager/NodeDaemon.idl +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -/** - * @file NodeDaemon.idl - * - * @brief Controling interface for managing and controling CIAO daemon. - */ - -#include "ciao/Deployment.idl" - -module CIAO -{ - /** - * @brief CIAO daemon process control program. - * - * @@The Inheritage might cause binary code bloating but - * it's an easy way of combining features. In the future we could - * move this definition into Deployment.idl. - */ - interface NodeDaemon : Deployment::NodeManager - { - // Canonical name of this daemon - readonly attribute string name; - - // Shutdown the daemon process. - oneway void shutdown (); - }; -}; diff --git a/TAO/CIAO/DnC/NodeManager/NodeDaemon.mpc b/TAO/CIAO/DnC/NodeManager/NodeDaemon.mpc deleted file mode 100644 index 39770cf0ef0..00000000000 --- a/TAO/CIAO/DnC/NodeManager/NodeDaemon.mpc +++ /dev/null @@ -1,32 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project (NodeDaemon_stub): ciao_deployment_stub, ciao_server_dnc { - sharedname = NodeDaemon_stub - idlflags += -Wb,stub_export_macro=NodeDaemon_stub_Export -Wb,stub_export_include=NodeDaemon_stub_export.h - dynamicflags = NODEDAEMON_STUB_BUILD_DLL - - libs += TAO_IFR_Client - IDL_Files { - NodeDaemon.idl - } - - Source_Files { - NodeDaemonC.cpp - } -} - -project(Node_Daemon): ciao_deployment_svnt, ciao_deployment_stub, iortable, naming { - after += NodeApplicationManager NodeDaemon_stub - libs += NodeApplicationManager NodeDaemon_stub TAO_IFR_Client CIAO_Server - exename = Node_Daemon - - IDL_Files { - } - - Source_Files { - NodeDaemonS.cpp - NodeDaemon_Impl.cpp - Node_Daemon.cpp - } -} diff --git a/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.cpp b/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.cpp deleted file mode 100644 index 1012a9bf4b3..00000000000 --- a/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.cpp +++ /dev/null @@ -1,174 +0,0 @@ -// $Id$ - -#include "NodeDaemon_Impl.h" -#include "../NodeApplicationManager/NodeApplicationManager_Impl.h" - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -CIAO::NodeDaemon_Impl::NodeDaemon_Impl (const char *name, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - const char * nodapp_loc, - int spawn_delay) - ACE_THROW_SPEC ((CORBA::SystemException)) - : orb_ (CORBA::ORB::_duplicate (orb)), - poa_ (PortableServer::POA::_duplicate (poa)), - name_ (CORBA::string_dup (name)), - nodeapp_location_ (CORBA::string_dup (nodapp_loc)), - callback_poa_ (PortableServer::POA::_nil ()), - spawn_delay_ (spawn_delay), - manager_ (Deployment::NodeApplicationManager::_nil ()) -{ - ACE_TRY - { - //create the call back poa for NAM. - PortableServer::POAManager_var mgr - = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->callback_poa_ = - this->poa_->create_POA ("callback_poa", - mgr.in (), - 0 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeDaemon_Impl::constructor\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; -} - -CIAO::NodeDaemon_Impl::~NodeDaemon_Impl () -{ - -} - -PortableServer::POA_ptr -CIAO::NodeDaemon_Impl::_default_POA (void) -{ - return PortableServer::POA::_duplicate (this->poa_.in ()); -} - - -char * -CIAO::NodeDaemon_Impl::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return CORBA::string_dup (this->name_.in ()); -} - -void -CIAO::NodeDaemon_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -void -CIAO::NodeDaemon_Impl::joinDomain (const Deployment::Domain & , - Deployment::TargetManager_ptr , - Deployment::Logger_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_THROW (CORBA::NO_IMPLEMENT ()); -} - -void -CIAO::NodeDaemon_Impl::leaveDomain (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - //Implementation undefined. - ACE_THROW (CORBA::NO_IMPLEMENT ()); -} - - -Deployment::NodeApplicationManager_ptr -CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError, - Deployment::PlanError)) -{ - // Return cached manager - ACE_TRY - { - if (CORBA::is_nil (this->manager_.in ())) - { - //Implementation undefined. - CIAO::NodeApplicationManager_Impl *app_mgr; - ACE_NEW_THROW_EX (app_mgr, - CIAO::NodeApplicationManager_Impl (this->orb_.in (), - this->poa_.in ()), - CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; - - PortableServer::ServantBase_var safe (app_mgr); - - //@@ Note: after the init call the servant ref count would become 2. so - // we can leave the safeservant along and be dead. Also note that I added - this->manager_ = - app_mgr->init (this->nodeapp_location_, - this->spawn_delay_, - plan, - this->callback_poa_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Obtain the Object Reference - //CORBA::Object_var obj = - // this->poa_->servant_to_reference (app_mgr ACE_ENV_ARG_PARAMETER); - //ACE_TRY_CHECK; - - //this->manager_ = - // Deployment::NodeApplicationManager::_narrow (obj.in ()); - if (CORBA::is_nil (this->manager_.in ())) - { - ACE_DEBUG ((LM_DEBUG, "NodeDaemon_Impl:preparePlan: NodeApplicationManager ref is nil\n")); - ACE_THROW (Deployment::StartError ()); - } - } - - // Duplicate this reference to the caller - return - Deployment::NodeApplicationManager::_duplicate (this->manager_.in ()); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeDaemon_Impl::preparePlan\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); -} - -void -CIAO::NodeDaemon_Impl::destroyManager (Deployment::NodeApplicationManager_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)) -{ - ACE_TRY - { - // Deactivate this object - PortableServer::ObjectId_var id = - this->poa_->reference_to_id (this->manager_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->manager_ = Deployment::NodeApplicationManager::_nil (); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeDaemon_Impl::destroyManager\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; -} diff --git a/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.h b/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.h deleted file mode 100644 index 7802f84f964..00000000000 --- a/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.h +++ /dev/null @@ -1,127 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Daemon_Impl.h - * - * $Id$ - * - * This file contains servant implementation for Deployment:NodeManager - * interface. In the current design of the NodeManager, as with the legacy - * implementation of CIAO, Each NodeManager corresponds to ONE NodeApplication - * Manager. Though, the name intuitively suggests that there be one NodeManager - * for every node, our design, allows the end-user to have multiple components - * run on the same node. - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//============================================================================= - - -#ifndef CIAO_NODEDAEMON_IMPL_H -#define CIAO_NODEDAEMON_IMPL_H -#include /**/ "ace/pre.h" - -#include "NodeDaemonS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -namespace CIAO -{ - /** - * @class NodeDaemon_Impl - * - * @brief Servant implementation CIAO's daemon process control interface - * - * This class implements the CIAO:NodeDaemon interface. - * - */ - class NodeDaemon_Impl - : public virtual POA_CIAO::NodeDaemon, - public virtual PortableServer::RefCountServantBase - { - public: - - /// Constructor - NodeDaemon_Impl (const char *name, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr p, - const char * nodeapp_loc, - int spawn_delay) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Get the containing POA. This operation does *not* - /// increase the reference count of the POA. - virtual PortableServer::POA_ptr _default_POA (void); - - /// CIAO::Daemon defined attributes/operations. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void joinDomain (const Deployment::Domain & domain, - Deployment::TargetManager_ptr manager, - Deployment::Logger_ptr log - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void leaveDomain (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual ::Deployment::NodeApplicationManager_ptr - preparePlan (const Deployment::DeploymentPlan &plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError, - Deployment::PlanError)); - - virtual void - destroyManager (Deployment::NodeApplicationManager_ptr appManager - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StopError)); - - protected: - // Since this class is reference counted, making this - // destructor protected to enforce proper memory managment - // through the reference counting mechanism (i.e. to - // disallow calling operator delete() on an instance of - // this class. - /// Destructor - virtual ~NodeDaemon_Impl (void); - - // Keep a pointer to the managing ORB serving this servant. - CORBA::ORB_var orb_; - - // Keep a pointer to the managing POA. - PortableServer::POA_var poa_; - - // My Canonical name. - CORBA::String_var name_; - - // NodeApplication location - CORBA::String_var nodeapp_location_; - - // Cached callback POA. - PortableServer::POA_var callback_poa_; - - // Spawn delay for the NodeAppMgr - int spawn_delay_; - - // Cache reference of last NodeAppManager - Deployment::NodeApplicationManager_var manager_; - - }; -} -#if defined (__ACE_INLINE__) -# include "NodeDaemon_Impl.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" -#endif /* CIAO_NODEDAEMON_IMPL_H */ diff --git a/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.inl b/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.inl deleted file mode 100644 index 6318deb79a0..00000000000 --- a/TAO/CIAO/DnC/NodeManager/NodeDaemon_Impl.inl +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ diff --git a/TAO/CIAO/DnC/NodeManager/NodeDaemon_stub_export.h b/TAO/CIAO/DnC/NodeManager/NodeDaemon_stub_export.h deleted file mode 100644 index 346bdf5785c..00000000000 --- a/TAO/CIAO/DnC/NodeManager/NodeDaemon_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl NodeDaemon_stub -// ------------------------------ -#ifndef NODEDAEMON_STUB_EXPORT_H -#define NODEDAEMON_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (NODEDAEMON_STUB_HAS_DLL) -# define NODEDAEMON_STUB_HAS_DLL 1 -#endif /* ! NODEDAEMON_STUB_HAS_DLL */ - -#if defined (NODEDAEMON_STUB_HAS_DLL) && (NODEDAEMON_STUB_HAS_DLL == 1) -# if defined (NODEDAEMON_STUB_BUILD_DLL) -# define NodeDaemon_stub_Export ACE_Proper_Export_Flag -# define NODEDAEMON_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define NODEDAEMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* NODEDAEMON_STUB_BUILD_DLL */ -# define NodeDaemon_stub_Export ACE_Proper_Import_Flag -# define NODEDAEMON_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define NODEDAEMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* NODEDAEMON_STUB_BUILD_DLL */ -#else /* NODEDAEMON_STUB_HAS_DLL == 1 */ -# define NodeDaemon_stub_Export -# define NODEDAEMON_STUB_SINGLETON_DECLARATION(T) -# define NODEDAEMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* NODEDAEMON_STUB_HAS_DLL == 1 */ - -// Set NODEDAEMON_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (NODEDAEMON_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define NODEDAEMON_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define NODEDAEMON_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !NODEDAEMON_STUB_NTRACE */ - -#if (NODEDAEMON_STUB_NTRACE == 1) -# define NODEDAEMON_STUB_TRACE(X) -#else /* (NODEDAEMON_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define NODEDAEMON_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (NODEDAEMON_STUB_NTRACE == 1) */ - -#endif /* NODEDAEMON_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/NodeManager/Node_Daemon.cpp b/TAO/CIAO/DnC/NodeManager/Node_Daemon.cpp deleted file mode 100644 index f29c5d50922..00000000000 --- a/TAO/CIAO/DnC/NodeManager/Node_Daemon.cpp +++ /dev/null @@ -1,259 +0,0 @@ -// $Id$ - -//============================================================== -/** - * @file Node_Daemon.cpp - * - * @brief CIAO's Node Daemon implementation - * - * NodeDaemon is the bootstraping mechanism to create new - * NodeApplication on the localhost. We currently depend on - * starting the NodeApplicationManager process on some port of all - * the hosts that have NodeApplication install to function properly. - * The port to run this daemon can be set by using the TAO ORB options - * command of -ORBEndpoint <port>. This replaces the earlier CIAO_Daemon - * implementation of CIAO as defined in the CCM specification. - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * @author Tao Lu <lu@dre.vanderbilt.edu> - */ -//=============================================================== - -#include "NodeDaemon_Impl.h" -#include "tao/IORTable/IORTable.h" - -// Include Name Service header -#include "orbsvcs/orbsvcs/CosNamingC.h" - -#include "ace/SString.h" -#include "ace/Read_Buffer.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_unistd.h" -#include "ciao/Server_init.h" -#include "ciao/CIAO_common.h" - -const char *ior_file_name_ = "nodedaemon.ior"; -char *default_svcconf_ = 0; -char *svcconf_config_ = 0; -char *nodeapp_location_ = 0; - -int write_to_ior_ = 0; -int register_with_ns_ = 0; -int nodeapp_loc_ = 0; -int spawn_delay = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:c:m:s:d:n"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': // get the file name to write to - ior_file_name_ = get_opts.opt_arg (); - write_to_ior_ = 1; - break; - - case 'c': // get the default svc.conf filename - default_svcconf_ = get_opts.opt_arg (); - break; - - case 'm': // get the svc.conf map configuration filename - svcconf_config_ = get_opts.opt_arg (); - break; - - case 's': //get the location to spawn the NodeApplication - nodeapp_location_ = get_opts.opt_arg (); - nodeapp_loc_ = 1; - break; - - case 'd': //get the spawn delay argument - spawn_delay = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case 'n': - register_with_ns_ = 1; - break; - - case '?': // display help for use of the server. - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-o <ior_output_file>\n" - "-c <svc.conf file>\n" - "-n <use naming service>\n" - "-s <NodeApplication executable path>\n" - "\n", - argv [0]), - -1); - } - - return 0; -} - -int -write_IOR(const char* ior) -{ - FILE* ior_output_file_ = - ACE_OS::fopen (ior_file_name_, "w"); - - if (ior_output_file_) - { - ACE_OS::fprintf (ior_output_file_, - "%s", - ior); - ACE_OS::fclose (ior_output_file_); - } - - return 0; -} - -int -register_with_ns (const char * name_context, - CORBA::ORB_ptr orb, - CIAO::NodeDaemon_ptr obj) -{ - // Naming Service related operations - CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService"); - - CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_context_object.in ()); - - // Initialize the Naming Sequence - CosNaming::Name name (1); - name.length (1); - // Register the name with the NS - name[0].id = CORBA::string_dup (name_context); - - // Register the servant with the Naming Service - naming_context->bind (name, obj); - - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CIAO::Server_init (orb.in ()); - - if (parse_args (argc, argv) != 0) - return -1; - - // Check if NodeApplication executable location has been - // specified - if (! nodeapp_loc_) - { - ACE_DEBUG ((LM_DEBUG, "Use -s <NodeApplicationPath> to specify \ - executable path\n")); - exit (1); - } - - // Get reference to Root POA. - CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POA_var poa - = PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (adapter.in ())) - ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1); - - - // Create and install the CIAO Daemon servant - CIAO::NodeDaemon_Impl *daemon_servant = 0; - ACE_NEW_RETURN (daemon_servant, - CIAO::NodeDaemon_Impl("NodeDaemon", - orb.in (), - poa.in (), - nodeapp_location_, - spawn_delay), - -1); - PortableServer::ServantBase_var safe_daemon (daemon_servant); - // Implicit activation - - CIAO::NodeDaemon_var daemon = daemon_servant->_this (); - - CORBA::String_var str = orb->object_to_string (daemon.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - adapter->bind ("NodeManager", str.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (write_to_ior_) - write_IOR (str.in ()); - else if (register_with_ns_) - { - char name [100]; - if (ACE_OS::hostname (name, 100) == -1) - { - ACE_DEBUG ((LM_DEBUG, "gethostname call failed! \n")); - exit (1); - } - - // Register this name with the Naming Service - register_with_ns (name, orb.in (), daemon.in ()); - } - - ACE_DEBUG ((LM_INFO, "CIAO_NodeDaemon IOR: %s\n", str.in ())); - - // Activate POA manager - PortableServer::POAManager_var mgr - = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - // End Deployment part - ACE_DEBUG ((LM_DEBUG, - "CIAO_NodeDaemon is running...\n")); - - // Run the main event loop for the ORB. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO_NodeDaemon::main\t\n"); - return 1; - } - ACE_ENDTRY; - - ACE_DEBUG ((LM_DEBUG, - "CIAO_NodeDaemon has closed\n")); - return 0; -} diff --git a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.idl b/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.idl deleted file mode 100644 index 1fc19b0d1be..00000000000 --- a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.idl +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#include "Deployment.idl" - -module CIAO -{ - interface RepositoryManagerDaemon : Deployment::RepositoryManager - { - // Shutdown the daemon process. - oneway void shutdown (); - }; -}; diff --git a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.mpc b/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.mpc deleted file mode 100644 index ffb391133e3..00000000000 --- a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.mpc +++ /dev/null @@ -1,25 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(Repository_Manager): ciao_server_dnc,ciao_deployment_svnt, ciao_deployment_stub, taoexe { - exename = executor - after += Config_Handlers ExecutionManager_stub NodeDaemon_stub - macros += XML_USE_PTHREADS - includes += /usr/include $(XERCESCROOT)/include - libpaths += /usr/lib $(XERCESCROOT)/lib - libs += xerces-c Config_Handlers NodeDaemon_stub - libs += ExecutionManager_stub CIAO_DnC_Server - after += Config_Handlers - - IDL_Files { - RepositoryManager.idl - } - - Source_Files { - RepositoryManagerC.cpp - RepositoryManagerS.cpp - Update_Plan.cpp - Repository_Manager.cpp - RepositoryManager_Impl.cpp - } -} diff --git a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DnC/RepositoryManager/RepositoryManager_Impl.cpp deleted file mode 100644 index a9443280afa..00000000000 --- a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager_Impl.cpp +++ /dev/null @@ -1,243 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "RepositoryManager_Impl.h" -#include "Config_Handlers/TPD_Handler.h" - -CIAO::RepositoryManager_Impl::RepositoryManager_Impl - (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa) - : orb_ (CORBA::ORB::_duplicate (orb)), - poa_ (PortableServer::POA::_duplicate (poa)) - // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet - // large. The maximum size of an ACE_Hash_Map_Manager is - // also fixed, i.e. it does not grow dynamically on demand. - // Make sure the default size of component_map_ is - // appropriate for your needs. You may also want to make - // the size configurable at compile-time, at least. -{ -} - -CIAO::RepositoryManager_Impl::RepositoryManager_Impl () - // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet - // large. The maximum size of an ACE_Hash_Map_Manager is - // also fixed, i.e. it does not grow dynamically on demand. - // Make sure the default size of component_map_ is - // appropriate for your needs. You may also want to make - // the size configurable at compile-time, at least. -{ -} - -CIAO::RepositoryManager_Impl::~RepositoryManager_Impl () -{ -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -void -CIAO::RepositoryManager_Impl:: -installPackage (const char* installation_name, - const char* location - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NameExists, - Deployment::PackageError)) -{ - try - { - xercesc::XMLPlatformUtils::Initialize(); - } - catch (const XMLException& xml_e) - { - char* message = XMLString::transcode (xml_e.getMessage()); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message)); - return; - } - try - { - CIAO::Config_Handler::Config_Error_Handler tpd_err_handler; - CIAO::Config_Handler::Config_Error_Handler pc_err_handler; - std::auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils:: - create_parser ()); - tpd_parser->setErrorHandler(&tpd_err_handler); - DOMDocument* tpd_doc = tpd_parser->parseURI (location); - - if (tpd_err_handler.getErrors()) - { - throw DOMException (); - } - - CIAO::Config_Handler::TPD_Handler top_pc_handler - (tpd_doc, - DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT); - ACE_TString package_location = top_pc_handler. - process_TopLevelPackageDescription (); - - std::auto_ptr<DOMBuilder> pc_parser (CIAO::Config_Handler::Utils:: - create_parser ()); - pc_parser->setErrorHandler(&pc_err_handler); - DOMDocument* pc_doc = pc_parser->parseURI (package_location.c_str()); - - if (pc_err_handler.getErrors()) - { - throw DOMException (); - } - - CIAO::Config_Handler::PC_Handler pc_handler (pc_doc, - DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT); - pc_handler.process_PackageConfiguration (this->pc_); - this->pc_table_.bind (installation_name, &(pc_)); - } - catch (CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: "); - return; - } - catch (const DOMException& e) - { - const unsigned int maxChars = 2047; - XMLCh errText[maxChars + 1]; - - ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \ - \n",location)); - ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code)); - if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars)) - { - char* message = XMLString::transcode (errText); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_ERROR ((LM_ERROR, "Message is: %s\n", message)); - } - ACE_ERROR ((LM_ERROR, "Caught DOM exception\n")); - return; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Caught unknown exception\n")); - return; - } -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -void -CIAO::RepositoryManager_Impl:: -createPackage (const char*, - const Deployment::PackageConfiguration&, - const char*, - CORBA::Boolean - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NameExists, - Deployment::PackageError)) -{ - // @@ (OO) It appears that you should be throwing a - // CORBA::NO_IMPLEMENT exception here. Please confirm. -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -Deployment::PackageConfiguration* -CIAO::RepositoryManager_Impl:: -findPackageByName (const char* name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NoSuchName)) -{ - Deployment::PackageConfiguration* pc = 0; - if (pc_table_.find (name, pc) == 0) - { - // @@ (OO) It appears that you should be returning a - // duplicated/copied version of the found - // PackageConfiguration. - return pc; - } - - // @@ (OO) It appears that you should be throwing a - // Deployment::NoSuchName exception here. Please confirm. - return 0; -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -Deployment::PackageConfiguration* -CIAO::RepositoryManager_Impl:: -findPackageByUUID (const char* - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NoSuchName)) -{ - // @@ (OO) It appears that you should be throwing a - // CORBA::NO_IMPLEMENT exception here. Please confirm. - return 0; -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -CORBA::StringSeq* -CIAO::RepositoryManager_Impl:: -findNamesByType (const char* - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // @@ (OO) It appears that you should returning a sequence of length - // zero. Please confirm. - return 0; -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -CORBA::StringSeq* -CIAO::RepositoryManager_Impl:: -getAllNames (ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // @@ (OO) It appears that you should returning a sequence of length - // zero. Please confirm. - return 0; -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -CORBA::StringSeq* -CIAO::RepositoryManager_Impl:: -getAllTypes (ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // @@ (OO) It appears that you should returning a sequence of length - // zero. Please confirm. - return 0; -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -void -CIAO::RepositoryManager_Impl:: -deletePackage (const char* - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NoSuchName)) -{ -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -void -CIAO::RepositoryManager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // @@ (OO) Wrong emulated exception argument. Use - // ACE_ENV_ARG_PARAMETER instead. - this->orb_->shutdown (1 ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); -} diff --git a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DnC/RepositoryManager/RepositoryManager_Impl.h deleted file mode 100644 index c22e24ad367..00000000000 --- a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager_Impl.h +++ /dev/null @@ -1,175 +0,0 @@ -/*======================================================================= - * - * @file RepositoryManager_Impl.h - * - * $Id$ - * - * @brief This file contains implementation for - * Deployment::RepositoryManager interface. - * - * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - * - *======================================================================*/ - -#ifndef REPOSITORYMANAGER_IMPL_H -#define REPOSITORYMANAGER_IMPL_H - -#include "RepositoryManagerS.h" -#include "ace/Get_Opt.h" -#include "RepositoryManager_Impl.h" -#include "ace/Synch.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "tao/Exception.h" -#include "CIAO/DnC/Config_Handlers/XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/parsers/XercesDOMParser.hpp> -#include <xercesc/parsers/AbstractDOMParser.hpp> -#include "CIAO/DnC/Config_Handlers/Config_Handler_export.h" -#include "CIAO/DnC/Config_Handlers/Domain_Handler.h" -#include "CIAO/DnC/Config_Handlers/PC_Handler.h" -#include "CIAO/DnC/Config_Handlers/Plan_Handler.h" -#include "CIAO/DnC/Config_Handlers/CompImplDesc_Handler.h" -#include "CIAO/DnC/Config_Handlers/DnC_Dump.h" -#include "CIAO/DnC/Config_Handlers/Utils.h" -#include "CIAO/DnC/Config_Handlers/Config_Error_Handler.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMAttr; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMNodeList; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; -using xercesc::XercesDOMParser; -using xercesc::AbstractDOMParser; - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * - * @class ReposityManager_Impl - * - * @brief This class implements the RepositoryManager. RepositoryManager - * assists the execution process after the planning stage. - * - */ -namespace CIAO -{ - class RepositoryManager_Impl - : public virtual POA_CIAO::RepositoryManagerDaemon, - public virtual PortableServer::RefCountServantBase - { - - public: - - RepositoryManager_Impl (); - - /// Constructor. - RepositoryManager_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL); - - // @@ (OO) Since this class is reference counted, please make this - // destructor protected to enforce proper memory managment - // through the reference counting mechanism (i.e. to - // disallow calling operator delete() on an instance of - // this class. - /// Destructor. - ~RepositoryManager_Impl (); - - virtual void installPackage (const char* installation_name, - const char* location - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NameExists, - Deployment::PackageError)); - - virtual void createPackage (const char* installation_name, - const Deployment::PackageConfiguration& pc, - const char* base_location, - CORBA::Boolean replace - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NameExists, - Deployment::PackageError)); - - virtual Deployment::PackageConfiguration* - findPackageByName (const char* name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NoSuchName)); - - virtual Deployment::PackageConfiguration* - findPackageByUUID (const char* name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NoSuchName)); - - virtual CORBA::StringSeq* - findNamesByType (const char* type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::StringSeq* - getAllNames (ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::StringSeq* - getAllTypes (ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void - deletePackage (const char* name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::NoSuchName)); - - virtual void - shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - protected: - - // @@ (OO) You may want to change the external ID to an - // ACE_CString to ease memory management. - typedef ACE_Hash_Map_Manager_Ex<const char *, - Deployment::PackageConfiguration*, - ACE_Hash<const char *>, ACE_Equal_To<const char *>, - TAO_SYNCH_MUTEX> pc_table; - - typedef pc_table::iterator pc_iterator; - // Cached ORB pointer - CORBA::ORB_var orb_; - - // Cached POA pointer - PortableServer::POA_var poa_; - - // @@ (OO) Does this really need to be cached? Can't you just - // keep it local to the installPackage() method, the - // only place where it is used? Please confirm. - // Package Configuration element - Deployment::PackageConfiguration pc_; - - pc_table pc_table_; - }; -}; - -#include /**/ "ace/post.h" -#endif /* REPOSITORYMANAGER_IMPL_H */ diff --git a/TAO/CIAO/DnC/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DnC/RepositoryManager/Repository_Manager.cpp deleted file mode 100644 index d8531775896..00000000000 --- a/TAO/CIAO/DnC/RepositoryManager/Repository_Manager.cpp +++ /dev/null @@ -1,278 +0,0 @@ -// $Id$ - -#include "RepositoryManager_Impl.h" -#include "Update_Plan.h" -#include "ExecutionManager/ExecutionManagerC.h" -#include "NodeManager/NodeDaemonC.h" -#include "ace/OS_NS_stdio.h" -#include "ace/streams.h" -using namespace std; - -const char * exec_ior = "file://exec_mgr.ior"; -const char * node_daemon_ior = 0; - -static void -usage (const ACE_TCHAR* program) -{ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Usage: %s -p <URI> -d <URI> -k <EX_IOR> \ - -t <NODE_MANAGER_IOR> \n") - ACE_TEXT (" <URI>: URI identifying the package\n"), - program)); -} - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - // top level package URL - char* package_url = 0; - - // deployment plan URL - char* plan_url = 0; - - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:d:k:t:")); - int c; - - while ((c = get_opt ()) != EOF) - { - switch (c) - { - case 'p': - package_url = get_opt.opt_arg (); - break; - case 'd': - plan_url = get_opt.opt_arg (); - break; - case 'k': - exec_ior = get_opt.opt_arg (); - break; - case 't': - node_daemon_ior = get_opt.opt_arg (); - break; - default: - usage(argv[0]); - return -1; - } - } - - if (package_url == 0) { - usage(argv[0]); - return -1; - } - - if (plan_url == 0) { - usage(argv[0]); - return -1; - } - - // Initialize the ORB so that CORBA::Any will work - // - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); - - try - { - xercesc::XMLPlatformUtils::Initialize(); - } - - catch (const XMLException& xml_e) - { - char* message = XMLString::transcode (xml_e.getMessage()); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message)); - return 1; - } - try - { - // get a reference to the parser. - std::auto_ptr<DOMBuilder> plan_parser (CIAO::Config_Handler::Utils:: - create_parser ()); - CIAO::Config_Handler::Config_Error_Handler handler; - plan_parser->setErrorHandler(&handler); - - std::auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils:: - create_parser ()); - CIAO::Config_Handler::Config_Error_Handler tpd_handler; - tpd_parser->setErrorHandler(&tpd_handler); - - // use the parser to parse the deployment plan URL and create - // a DOM document. - DOMDocument* plan_doc = plan_parser->parseURI (plan_url); - if (handler.getErrors()) - { - return 1; - } - - DOMDocument* tpd_doc = tpd_parser->parseURI (package_url); - if (tpd_handler.getErrors()) - { - return 1; - } - - if (plan_doc == NULL) - { - ACE_DEBUG ((LM_DEBUG, "Null DOM Document obtained, \ - May be the URL is wrong!!\n")); - throw Null_Dom_Document (); - } - - // free up DOMBuilder. DOMBuilder also deletes the DOMDocument memory. - //auto_ptr<DOMBuilder> cleanup_parser (parser); - - // call the Deployment Plan handler to parse the XML descriptor. - CIAO::Config_Handler::Plan_Handler plan_handler (plan_doc, - DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT); - Deployment::DeploymentPlan plan; - plan_handler.process_plan (plan); - - // call the PackageConfiguration handler to parse the XML descriptor. - Deployment::PackageConfiguration* pc; - CIAO::RepositoryManager_Impl rep_impl; - rep_impl.installPackage ("PC", package_url); - pc = rep_impl.findPackageByName ("PC"); - - REF_MAP ref_map; - REF_MAP primary_ref_map; - - // traverse the PackageConfiguration IDL data structure and - // update the deployment plan IDL data structure. - traverse_package (pc, plan, ref_map, primary_ref_map); - - //Deployment::DnC_Dump::dump (plan); - - // Pass the parsed plan to the Execution Manager to start the - // Deployment Process. - - CORBA::Object_var obj = orb->string_to_object (exec_ior - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CIAO::ExecutionManagerDaemon_var exec_mgr = - CIAO::ExecutionManagerDaemon::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (exec_mgr.in ())) - { - ACE_DEBUG ((LM_DEBUG, - "Executor: nil Execution Manager reference, \ - narrow failed\n")); - return 1; - - } - - CIAO::NodeDaemon_var node_mgr; - if (node_daemon_ior != 0) - { - CORBA::Object_var node_mgr_obj = orb->string_to_object - (node_daemon_ior - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - node_mgr = - CIAO::NodeDaemon::_narrow (node_mgr_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (node_mgr.in ())) - { - ACE_DEBUG ((LM_DEBUG, - "Executor: nil Node Manager reference, \ - narrow failed\n")); - return 1; - } - } - - ACE_DEBUG ((LM_DEBUG, "Executor: Obtained Execution Manager ref \n")); - Deployment::DomainApplicationManager_var dapp_mgr = - exec_mgr->preparePlan (plan, 1); - - if (CORBA::is_nil (dapp_mgr.in ())) - { - ACE_DEBUG ((LM_DEBUG, - "Executor:preparePlan call failed:nil \ - DomainApplicationManager reference\n")); - return 1; - } - ACE_DEBUG ((LM_DEBUG, - "Executor: Obtained DomainApplication Manager ref \n")); - - // Create a dummy set of properties and start the - // Launching of applications - Deployment::Properties_var properties; - ACE_NEW_RETURN (properties, - Deployment::Properties, - 1); - ACE_DEBUG ((LM_DEBUG, "Executor: start Launch application.....")); - // Start the Application immediately - int start = 1; - dapp_mgr->startLaunch (properties.in (), start); - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - - ACE_DEBUG ((LM_DEBUG, "Executor: finish Launch application.....")); - // Call finish Launch to complete the connections - dapp_mgr->finishLaunch (start); - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - - ACE_DEBUG ((LM_DEBUG, "Executor: Application Deployed successfully \n")); - ACE_DEBUG ((LM_DEBUG, "Press <Enter> to tear down application \n")); - - char dummy [256]; - cin.getline (dummy, 256); - // Tear down the assembly - - ACE_DEBUG ((LM_DEBUG, "Executor: destroy the application.....")); - dapp_mgr->destroyApplication (); - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - - ACE_DEBUG ((LM_DEBUG, "Executor: destroy the manager.....")); - exec_mgr->destroyManager (dapp_mgr.in ()); - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - - if (node_daemon_ior != 0) - { - ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n")); - exec_mgr->shutdown (); // shut down execution manager. - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - - ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n")); - node_mgr->shutdown (); // shut down the node manager. - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - } - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - catch (CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: "); - while (true); // @@ (OO) What purpose does this server? - return -1; - } - catch (const DOMException& e) - { - const unsigned int maxChars = 2047; - XMLCh errText[maxChars + 1]; - - ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \ - \n",plan_url)); - ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code)); - if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars)) - { - char* message = XMLString::transcode (errText); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_ERROR ((LM_ERROR, "Message is: %s\n", message)); - } - //ACE_PRINT_EXCEPTION ("Caught DOM Exception: "); - ACE_ERROR ((LM_ERROR, "Caught DOM exception\n")); - while (true); // @@ (OO) What purpose does this server? - return -1; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Caught unknown exception\n")); - while (true); // @@ (OO) What purpose does this server? - return -1; - } - - return 0; -} diff --git a/TAO/CIAO/DnC/RepositoryManager/Update_Plan.cpp b/TAO/CIAO/DnC/RepositoryManager/Update_Plan.cpp deleted file mode 100644 index 81cde782078..00000000000 --- a/TAO/CIAO/DnC/RepositoryManager/Update_Plan.cpp +++ /dev/null @@ -1,357 +0,0 @@ -// $Id$ - -#include "RepositoryManager_Impl.h" -#include "Update_Plan.h" -#include "DeploymentC.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/OS_NS_stdio.h" -#include "ace/streams.h" - -void traverse_package (Deployment::PackageConfiguration* &pc, - Deployment::DeploymentPlan &plan, - REF_MAP &ref_map, REF_MAP &primary_ref_map) -{ - // @@ (OO) The three loops in this function are nested, meaning that - // performance will be O(n^3). On top of that, each of the - // loops makes function calls that execute nested loops - // themselves, potentially increasing the execution time by - // several additonal orders of magnitude (e.g. O(n^6). Is - // this really the only way to implement the required - // functionality? This is really only a problem if the sets - // being traversed are large. - - // @@ (OO) The "continue loop" condition portion of the for - // statement is executed during each loop iteration. To - // improve performance execute it only once outside the - // for-loop. - - // traverse the package configuration structure to get to the - // BasePackage which consists of assemblies. - // - for (CORBA::ULong x = 0; x < pc->basePackage.length (); ++x) - { - // @@ (OO) The "continue loop" condition portion of the for - // statement is executed during each loop iteration. To - // improve performance execute it only once outside the - // for-loop. - for (CORBA::ULong y = 0; - y < pc->basePackage[x].implementation.length (); ++y) - { - // @@ (OO) The "continue loop" condition portion of the for - // statement is executed during each loop iteration. To - // improve performance execute it only once outside the - // for-loop. - - // traverse the .cpd file and get to the referenced .cid file - // - Deployment::ComponentImplementationDescription cid = - pc->basePackage[x].implementation[y].referencedImplementation; - for (CORBA::ULong z = 0; z < cid.assemblyImpl.length (); ++z) - { - // traverse the .cid file and get to each - // of the "assemblyImpl" tags. - // - Deployment::ComponentAssemblyDescription assembly = - cid.assemblyImpl[z]; - // - // traverse the individual assembly. - // - traverse_assembly (assembly, plan, ref_map, primary_ref_map); - } - } - } -} - -void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly, - Deployment::DeploymentPlan &plan, - REF_MAP &ref_map, REF_MAP &primary_ref_map) -{ - // traverse the assembly (ComponentAssemblyDescription) and - // processes the instances and the connection within the assembly. - // - for (CORBA::ULong k = 0; k < assembly.instance.length (); ++k) - { - Deployment::SubcomponentInstantiationDescription ins = - assembly.instance[k]; - const char* in_name = ins.name; - for (CORBA::ULong l = 0; l < plan.instance.length (); ++l) - { - const char* plan_name = plan.instance[l].name; - if (strcmp (plan_name, in_name) == 0) - { - traverse_assembly_instance (ins, plan, l, - ref_map, primary_ref_map); - } - } - } - for (CORBA::ULong m = 0; m < assembly.connection.length (); ++m) - { - Deployment::AssemblyConnectionDescription - assembly_connection = assembly.connection[m]; - traverse_assembly_connection (assembly, - assembly_connection, - plan); - } -} - -void traverse_assembly_connection (Deployment::ComponentAssemblyDescription - &assembly, - Deployment::AssemblyConnectionDescription - &assembly_connection, - Deployment::DeploymentPlan &plan) -{ - // traverse the assembly connection and get information about the - // portName and the instances at each end of the connection. - // Also traverse the InterfaceDescriptions for each of those instances - // and populate the portKind information. - // - CORBA::ULong con_length (plan.connection.length ()); - plan.connection.length (con_length + 1); - for (CORBA::ULong n = 0; - n < assembly_connection.internalEndpoint.length (); - ++n) - { - CORBA::ULong iep_len (plan.connection[con_length]. - internalEndpoint.length ()); - plan.connection[con_length].internalEndpoint - .length (iep_len + 1); - plan.connection[con_length].internalEndpoint - [iep_len].portName = assembly_connection. - internalEndpoint[n].portName; - CORBA::ULong ins_ref = assembly_connection.internalEndpoint[n]. - instanceRef; - const char* ins_name = assembly.instance[ins_ref].name; - for (CORBA::ULong w = 0; w < plan.instance.length (); - ++w) - { - const char* pl_name = plan.instance[w].name; - if (strcmp (pl_name, ins_name) == 0) - { - plan.connection[con_length].internalEndpoint - [iep_len].instanceRef = w; - break; - } - } - traverse_interface (assembly.instance[ins_ref], - plan.connection[con_length]. - internalEndpoint[iep_len]); - } -} - -void traverse_interface (Deployment::SubcomponentInstantiationDescription - &instance, - Deployment::PlanSubcomponentPortEndpoint - &pspe) -{ - // traverse the InterfaceDescription of the instance and get information - // about the portkind of the port. - // - for (CORBA::ULong m = 0; m < instance.package.length (); ++m) - { - Deployment::ComponentPackageDescription - package = instance.package[m]; - - Deployment::ComponentInterfaceDescription - cid = package.realizes; - - for (CORBA::ULong n = 0; n < cid.port.length (); ++n) - { - const char* main_port_name = cid.port[n].name; - const char* port_name = pspe.portName; - if (strcmp (main_port_name, port_name) == 0) - { - pspe.kind = cid.port[n].kind; - } - } - } -} - -void traverse_assembly_instance (Deployment:: - SubcomponentInstantiationDescription - &instance, - Deployment::DeploymentPlan &plan, int l, - REF_MAP &ref_map, REF_MAP &primary_ref_map) -{ - // Each instance has a package. - // Each package has an implementation and their correspoding artifacts. - // Traverse this information and populate the artifact and the - // implementation information within the DeploymentPlan. - // - ART_REF_MAP art_ref_map; - - for (CORBA::ULong m = 0; m < instance.package.length (); ++m) - { - Deployment::ComponentPackageDescription - package = instance.package[m]; - - for (CORBA::ULong n = 0; n < package.implementation.length (); ++n) - { - Deployment::PackagedComponentImplementation - impl = package.implementation[n]; - CORBA::ULong impl_length (plan.implementation.length ()); - plan.implementation.length (impl_length + 1); - plan.implementation[impl_length].name = plan.instance[l].name; - plan.instance[l].implementationRef = impl_length; - - for (CORBA::ULong p = 0; - p < impl.referencedImplementation.monolithicImpl.length (); ++p) - { - Deployment::MonolithicImplementationDescription - mid = impl.referencedImplementation.monolithicImpl[p]; - - update_artifacts (mid, plan, plan.instance[l], - ref_map, primary_ref_map, art_ref_map, - plan.implementation[impl_length]); - } - update_impl_config_property (impl, plan.implementation[impl_length], - plan.instance[l]); - } - } -} - -void update_artifacts (Deployment::MonolithicImplementationDescription &mid, - Deployment::DeploymentPlan &plan, - Deployment::InstanceDeploymentDescription &instance, - REF_MAP &ref_map, REF_MAP &primary_ref_map, - ART_REF_MAP &art_ref_map, - Deployment::MonolithicDeploymentDescription &mdd) -{ - for (CORBA::ULong q = 0; q < mid.primaryArtifact.length (); ++q) - { - Deployment::ImplementationArtifactDescription - pack_iad = mid.primaryArtifact[q].referencedArtifact; - ACE_TString artifact_name = (const char*)mid.primaryArtifact[q].name; - int arti_len; - CORBA::ULong art_length (plan.artifact.length ()); - - if (ref_map.find (artifact_name, arti_len) != 0) - { - plan.artifact.length (art_length + 1); - plan.artifact[art_length].name = mid.primaryArtifact[q].name; - plan.artifact[art_length].node = instance.node; - ref_map.bind (artifact_name, art_length); - primary_ref_map.bind (artifact_name, art_length); - CORBA::ULong art_ref_len (mdd.artifactRef.length ()); - mdd.artifactRef.length (art_ref_len + 1); - mdd.artifactRef[art_ref_len] = art_length; - update_artifact_location (pack_iad, - plan.artifact[art_length]); - update_artifact_property (pack_iad, - plan.artifact[art_length]); - } - update_common_artifact_and_art_ref (pack_iad, - primary_ref_map, ref_map, - art_ref_map, mdd, - plan, instance); - } -} - -void update_common_artifact_and_art_ref (Deployment:: - ImplementationArtifactDescription - &pack_iad, - REF_MAP &primary_ref_map, - REF_MAP &ref_map, - ART_REF_MAP &art_ref_map, - Deployment:: - MonolithicDeploymentDescription &mid, - Deployment::DeploymentPlan &plan, - Deployment:: - InstanceDeploymentDescription - &instance) -{ - for (CORBA::ULong g = 0; - g < pack_iad.dependsOn.length (); ++g) - { - ACE_TString dep_name = - (const char*)pack_iad.dependsOn[g].name; - int arti_len; - - if (ref_map.find (dep_name, arti_len) == 0) - { - if (primary_ref_map.find (dep_name, arti_len) != 0) - { - if (art_ref_map.find (arti_len, arti_len) != 0) - { - update_impl_art_ref (mid, arti_len); - art_ref_map.bind (arti_len, arti_len); - } - } - } - else - { - Deployment::ImplementationArtifactDescription - depends_iad = pack_iad.dependsOn[g]. - referencedArtifact; - CORBA::ULong new_art_length (plan.artifact.length ()); - plan.artifact.length (new_art_length + 1); - plan.artifact[new_art_length].name = - pack_iad.dependsOn[g].name; - plan.artifact[new_art_length].node = instance.node; - update_artifact_location (depends_iad, - plan.artifact - [new_art_length]); - ref_map.bind ( - (const char*)plan.artifact[new_art_length].name, - new_art_length); - update_impl_art_ref (mid, new_art_length); - art_ref_map.bind (new_art_length, new_art_length); - } - } -} - -void update_impl_config_property (Deployment::PackagedComponentImplementation - &impl, - Deployment::MonolithicDeploymentDescription - &mid, - Deployment:: - InstanceDeploymentDescription - &instance) -{ - for (CORBA::ULong x = 0; - x < impl.referencedImplementation.configProperty.length (); ++x) - { - CORBA::ULong impl_pro_len (mid.execParameter.length ()); - mid.execParameter.length (impl_pro_len + 1); - mid.execParameter[impl_pro_len] - = impl.referencedImplementation.configProperty[x]; - CORBA::ULong ins_pro_len (instance.configProperty. length ()); - instance.configProperty.length (ins_pro_len + 1); - instance.configProperty[ins_pro_len] - = impl.referencedImplementation.configProperty[x]; - } -} - -void update_impl_art_ref (Deployment::MonolithicDeploymentDescription - &mid, int arti_len) -{ - CORBA::ULong new_art_ref_len (mid.artifactRef.length ()); - mid.artifactRef.length (new_art_ref_len + 1); - mid.artifactRef[new_art_ref_len] = arti_len; -} - -void update_artifact_location (Deployment::ImplementationArtifactDescription - &pack_iad, - Deployment::ArtifactDeploymentDescription - &plan_artifact) -{ - for (CORBA::ULong e = 0; e < pack_iad.location.length (); ++e) - { - CORBA::ULong art_loc_len (plan_artifact.location.length ()); - plan_artifact.location.length (art_loc_len + 1); - plan_artifact.location[art_loc_len] = pack_iad.location[e]; - } -} - -void update_artifact_property (Deployment::ImplementationArtifactDescription - &pack_iad, - Deployment::ArtifactDeploymentDescription - &plan_artifact) -{ - for (CORBA::ULong f = 0; - f < pack_iad.execParameter.length (); ++f) - { - CORBA::ULong art_pro_len (plan_artifact.execParameter.length ()); - plan_artifact.execParameter.length (art_pro_len + 1); - plan_artifact.execParameter[art_pro_len] = pack_iad.execParameter[f]; - } -} diff --git a/TAO/CIAO/DnC/RepositoryManager/Update_Plan.h b/TAO/CIAO/DnC/RepositoryManager/Update_Plan.h deleted file mode 100644 index 018a090cb94..00000000000 --- a/TAO/CIAO/DnC/RepositoryManager/Update_Plan.h +++ /dev/null @@ -1,97 +0,0 @@ -/*======================================================================= - * - * @file Update_Plan.h - * - * $Id$ - * - * @brief This file contains declarations for helper functions - * used in updating the deployment plan data structure from - * PackageConfiguration data structure. - * - * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - * - *======================================================================*/ - -#ifndef UPDATE_PLAN_H -#define UPDATE_PLAN_H - -#include "DeploymentC.h" -#include "ace/Hash_Map_Manager.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class Null_Dom_Document { }; -// exception thrown when we have a null dom document. - -typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP; -typedef ACE_Hash_Map_Manager<int, int, ACE_Null_Mutex> ART_REF_MAP; - -void traverse_assembly_instance (Deployment:: - SubcomponentInstantiationDescription - &instance, - Deployment::DeploymentPlan &plan, int l, - REF_MAP &ref_map, REF_MAP &primary_ref_map); - -void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly, - Deployment::DeploymentPlan &plan, - REF_MAP &ref_map, REF_MAP &primary_ref_map); - -void traverse_interface (Deployment::SubcomponentInstantiationDescription - &instance, - Deployment::PlanSubcomponentPortEndpoint - &pspe); - -void traverse_assembly_connection (Deployment::ComponentAssemblyDescription - &assembly, - Deployment::AssemblyConnectionDescription - &assembly_connection, - Deployment::DeploymentPlan &plan); - -void traverse_package (Deployment::PackageConfiguration* &pc, - Deployment::DeploymentPlan &plan, - REF_MAP &ref_map, REF_MAP &primary_ref_map); - -void update_artifacts (Deployment::MonolithicImplementationDescription &mid, - Deployment::DeploymentPlan &plan, - Deployment::InstanceDeploymentDescription &instance, - REF_MAP &ref_map, REF_MAP &primary_ref_map, - ART_REF_MAP &art_ref_map, - Deployment::MonolithicDeploymentDescription &mdd); - -void update_artifact_location (Deployment::ImplementationArtifactDescription - &pack_iad, - Deployment::ArtifactDeploymentDescription - &plan_artifact); - -void update_artifact_property (Deployment::ImplementationArtifactDescription - &pack_iad, - Deployment::ArtifactDeploymentDescription - &plan_artifact); - -void update_impl_art_ref (Deployment::MonolithicDeploymentDescription - &mid, int art_len); - -void update_impl_config_property (Deployment:: - PackagedComponentImplementation &impl, - Deployment:: - MonolithicDeploymentDescription &mid, - Deployment:: - InstanceDeploymentDescription - &instance); - -void update_common_artifact_and_art_ref (Deployment:: - ImplementationArtifactDescription &pack_iad, - REF_MAP &primary_ref_map, - REF_MAP &ref_map, - ART_REF_MAP &art_ref_map, - Deployment::MonolithicDeploymentDescription - &mid, - Deployment::DeploymentPlan &plan, - Deployment:: - InstanceDeploymentDescription - &instance); - -#include /**/ "ace/post.h" -#endif /* UPDATE_PLAN_H */ diff --git a/TAO/CIAO/DnC/XMI.xsd b/TAO/CIAO/DnC/XMI.xsd deleted file mode 100644 index f4adac91934..00000000000 --- a/TAO/CIAO/DnC/XMI.xsd +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'> - <xsd:attribute name="id" type="xsd:ID" /> - <xsd:attributeGroup name="IdentityAttribs"> - <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="LinkAttribs"> - <xsd:attribute name="href" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="ObjectAttribs"> - <xsd:attributeGroup ref="xmi:IdentityAttribs" /> - <xsd:attributeGroup ref="xmi:LinkAttribs" /> - <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" /> - </xsd:attributeGroup> - <xsd:complexType name="Extension"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="lax" /> - </xsd:choice> - <xsd:attribute ref="xmi:id" /> - <xsd:attributeGroup ref="xmi:ObjectAttribs" /> - <xsd:attribute name="extender" type="xsd:string" use="optional" /> - <xsd:attribute name="extenderID" type="xsd:string" use="optional" /> - </xsd:complexType> - <xsd:element name="Extension" type="xmi:Extension" /> - <xsd:complexType name="Any"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="skip" /> - </xsd:choice> - <xsd:anyAttribute processContents="skip" /> - </xsd:complexType> -</xsd:schema> diff --git a/TAO/CIAO/DnC/XMI.xsd.orig b/TAO/CIAO/DnC/XMI.xsd.orig deleted file mode 100644 index f4adac91934..00000000000 --- a/TAO/CIAO/DnC/XMI.xsd.orig +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'> - <xsd:attribute name="id" type="xsd:ID" /> - <xsd:attributeGroup name="IdentityAttribs"> - <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="LinkAttribs"> - <xsd:attribute name="href" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="ObjectAttribs"> - <xsd:attributeGroup ref="xmi:IdentityAttribs" /> - <xsd:attributeGroup ref="xmi:LinkAttribs" /> - <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" /> - </xsd:attributeGroup> - <xsd:complexType name="Extension"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="lax" /> - </xsd:choice> - <xsd:attribute ref="xmi:id" /> - <xsd:attributeGroup ref="xmi:ObjectAttribs" /> - <xsd:attribute name="extender" type="xsd:string" use="optional" /> - <xsd:attribute name="extenderID" type="xsd:string" use="optional" /> - </xsd:complexType> - <xsd:element name="Extension" type="xmi:Extension" /> - <xsd:complexType name="Any"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="skip" /> - </xsd:choice> - <xsd:anyAttribute processContents="skip" /> - </xsd:complexType> -</xsd:schema> diff --git a/TAO/CIAO/DnC/ciao/CCM_Base.idl b/TAO/CIAO/DnC/ciao/CCM_Base.idl deleted file mode 100644 index 7e89723be4b..00000000000 --- a/TAO/CIAO/DnC/ciao/CCM_Base.idl +++ /dev/null @@ -1,144 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl - * tao_idl -I ../.. \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Base.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if defined (CIAO_HAS_IMPORT_KEYWORD) -// import ::CORBA; -#else -#include <orb.idl> -#endif /* CIAO_HAS_IMPORT_KEYWORD */ - -#if !defined (CCM_BASE_IDL) -#define CCM_BASE_IDL - -module Components -{ - /** - * @@ Commented out temporarily for lack of typePrefix support. - */ - typeprefix Components "omg.org"; - - typedef string FeatureName; - typedef sequence<FeatureName> NameList; - - valuetype Cookie - { - private CORBA::OctetSeq cookieValue; - }; - - valuetype PortDescription - { - public FeatureName name; - public CORBA::RepositoryId type_id; - }; - - valuetype FacetDescription : PortDescription - { - public Object facet_ref; - }; - - typedef sequence<FacetDescription> FacetDescriptions; - - typedef unsigned long FailureReason; - - exception InvalidName {}; - exception InvalidConnection {}; - exception ExceededConnectionLimit {}; - exception AlreadyConnected {}; - exception NoConnection {}; - exception CookieRequired {}; - exception CreateFailure { - FailureReason reason; - }; - exception FinderFailure - { - FailureReason reason; - }; - exception RemoveFailure - { - FailureReason reason; - }; - exception DuplicateKeyValue {}; - exception InvalidKey {}; - exception UnknownKeyValue {}; - exception NoKeyAvailable {}; - exception BadEventType - { - CORBA::RepositoryId expected_event_type; - }; - exception HomeNotFound {}; - exception WrongComponentType {}; - - typedef FailureReason InvalidConfigurationReason; - const InvalidConfigurationReason UnknownConfigValueName = 0; - const InvalidConfigurationReason InvalidConfigValueType = 1; - const InvalidConfigurationReason ConfigValueRequired = 2; - const InvalidConfigurationReason ConfigValueNotExpected = 3; - exception InvalidConfiguration - { - InvalidConfigurationReason reason; - FeatureName name; - }; - exception IllegalState {}; - - interface Navigation - { - Object provide_facet (in FeatureName name) - raises (InvalidName); - FacetDescriptions get_all_facets(); - FacetDescriptions get_named_facets (in NameList names) - raises (InvalidName); - boolean same_component (in Object object_ref); - }; - - valuetype ConnectionDescription - { - public Cookie ck; - public Object objref; - }; - typedef sequence<ConnectionDescription> ConnectionDescriptions; - - valuetype ReceptacleDescription : PortDescription - { - public boolean is_multiple; - public ConnectionDescriptions connections; - }; - typedef sequence<ReceptacleDescription> ReceptacleDescriptions; - - interface Receptacles - { - Cookie connect (in FeatureName name, in Object connection ) - raises (InvalidName, - InvalidConnection, - AlreadyConnected, - ExceededConnectionLimit); - - // @@ Changed to return the previously connected object reference -- basef on RTF 1.1. - Object disconnect (in FeatureName name, in Cookie ck) - raises (InvalidName, - InvalidConnection, - CookieRequired, - NoConnection); - - ConnectionDescriptions get_connections (in FeatureName name) - raises (InvalidName); - - ReceptacleDescriptions get_all_receptacles (); - - ReceptacleDescriptions get_named_receptacles (in NameList names) - raises (InvalidName); - }; -}; -#endif /* CCM_BASE_IDL */ diff --git a/TAO/CIAO/DnC/ciao/CCM_Component.idl b/TAO/CIAO/DnC/ciao/CCM_Component.idl deleted file mode 100644 index 3dcc86e4dd3..00000000000 --- a/TAO/CIAO/DnC/ciao/CCM_Component.idl +++ /dev/null @@ -1,149 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_COMPONENT_IDL) -#define CCM_COMPONENT_IDL - -#include "CCM_Event.idl" -#include "tao/IFR_Client/IFR_Base.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - abstract valuetype PrimaryKeyBase {}; - - interface CCMObject; //forward reference - - interface CCMHome - { - CORBA::IRObject get_component_def (); - CORBA::IRObject get_home_def (); - void remove_component ( in CCMObject comp) - raises (RemoveFailure); - }; - typedef sequence<CCMHome> CCMHomes; - - interface KeylessCCMHome - { - CCMObject create_component() - raises (CreateFailure); - }; - - interface HomeFinder - { - CCMHome find_home_by_component_type (in CORBA::RepositoryId comp_repid) - raises (HomeNotFound); - - CCMHome find_home_by_home_type (in CORBA::RepositoryId home_repid) - raises (HomeNotFound); - - CCMHome find_home_by_name (in string home_name) - raises (HomeNotFound); - }; - - interface Configurator - { - void configure (in CCMObject comp) - raises (WrongComponentType); - }; - - valuetype ConfigValue - { - public FeatureName name; - public any value; - }; - - typedef sequence<ConfigValue> ConfigValues; - - interface StandardConfigurator : Configurator - { - void set_configuration (in ConfigValues descr); - }; - - interface HomeConfiguration : CCMHome - { - void set_configurator (in Configurator cfg); - void set_configuration_values (in ConfigValues config); - void complete_component_configuration (in boolean b); - void disable_home_configuration(); - }; - - valuetype ComponentPortDescription - { - public FacetDescriptions facets; - public ReceptacleDescriptions receptacles; - public ConsumerDescriptions consumers; - public EmitterDescriptions emitters; - public PublisherDescriptions publishers; - }; - - interface CCMObject : Navigation, Receptacles, Events - { - CORBA::IRObject get_component_def ( ); - CCMHome get_ccm_home( ); - PrimaryKeyBase get_primary_key( ) - raises (NoKeyAvailable); - - /// CIAO specific operations to have some control on when and how - /// to activate components. - /** - * This is all from our work on ARMS where we needed to know whether - * every component has been configured, say for example to use - * logging in the assembly which could in turn be provided by a - * component. To get around all this we are adding some methods on - * this till we think of some standard way to do this. The problem - * is that the deployer should be able to call this as opposed to - * the home calling it as soon as the component is created. - * - * All these operations are called in the order mentioned, ie. the - * deployer calls ciao_preactivate () on all components, then - * ciao_activate and then ciao_postactivate (). The speciality is - * that these operations would be invoked on every target object - * before the next call is made. It is similar to the way - * portable interceptors work, trying to get everything onto the - * flow stack, but differ in the intention. - */ - void ciao_preactivate () - raises (InvalidConfiguration); - - void ciao_activate () - raises (InvalidConfiguration); - - void ciao_postactivate () - raises (InvalidConfiguration); - - void configuration_complete () - raises (InvalidConfiguration); - - void remove() - raises (RemoveFailure); - ComponentPortDescription get_all_ports (); - }; - - // @@ Enumeration and DefaultEnumeration are only for EJB to CCM - // mapping? At any rate, we should be able to skip them for now. - abstract valuetype Enumeration - { - boolean has_more_elements(); - CCMObject next_element(); - }; - - typedef sequence<CCMObject> CCMObjectSeq; - - valuetype DefaultEnumeration : Enumeration - { - private CCMObjectSeq objects; - }; -}; -#endif /* CCM_COMPONENT_IDL */ diff --git a/TAO/CIAO/DnC/ciao/CCM_Container.idl b/TAO/CIAO/DnC/ciao/CCM_Container.idl deleted file mode 100644 index 0b7d23562fc..00000000000 --- a/TAO/CIAO/DnC/ciao/CCM_Container.idl +++ /dev/null @@ -1,155 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_CONTAINER_IDL) -#define CCM_CONTAINER_IDL - -#include "CCM_Component.idl" -#include "orbsvcs/orbsvcs/SecurityLevel2.idl" -#include "CCM_Transaction.idl" - -// *************** Basic Container interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - typedef SecurityLevel2::Credentials Principal; - - local interface CCMContext - { - Principal get_caller_principal(); - - CCMHome get_CCM_home(); - - boolean get_rollback_only() - raises (IllegalState); - - Transaction::UserTransaction get_user_transaction() - raises (IllegalState); - - boolean is_caller_in_role (in string role); - - void set_rollback_only() - raises (IllegalState); - }; - - enum CCMExceptionReason - { - SYSTEM_ERROR, - CREATE_ERROR, - REMOVE_ERROR, - DUPLICATE_KEY, - FIND_ERROR, - OBJECT_NOT_FOUND, - NO_SUCH_ENTITY - }; - - exception CCMException - { - CCMExceptionReason reason; - }; - - local interface EnterpriseComponent {}; - - local interface SessionContext : CCMContext - { - Object get_CCM_object() - raises (IllegalState); - }; - - local interface SessionComponent : EnterpriseComponent - { - void set_session_context ( in SessionContext ctx) - raises (CCMException); - - void ccm_activate() - raises (CCMException); - - void ccm_passivate() - raises (CCMException); - - /// The following two methods are CIAO specific extension. - /** - * This method is invoked before ccm_activate () is called. All - * components in the assembly get this callback before the - * ccm_activate () is called. - */ - void ciao_preactivate () - raises (CCMException); - - /** - * This method is invoked after ccm_activate () is called. All - * components in the assembly get this callback after the - * ccm_activate () is called. - */ - void ciao_postactivate () - raises (CCMException); - - void ccm_remove () - raises (CCMException); - }; - - local interface SessionSynchronization - { - void after_begin () - raises (CCMException); - - void before_completion () - raises (CCMException); - - void after_completion (in boolean committed) - raises (CCMException); - }; - - local interface EntityContext : CCMContext - { - Object get_CCM_object () - raises (IllegalState); - - PrimaryKeyBase get_primary_key () - raises (IllegalState); - }; - - local interface EntityComponent : EnterpriseComponent - { - void set_entity_context (in EntityContext ctx) - raises (CCMException); - - void unset_entity_context () - raises (CCMException); - - void ccm_activate () - raises (CCMException); - - void ccm_load () - raises (CCMException); - - void ccm_store () - raises (CCMException); - - void ccm_passivate () - raises (CCMException); - - void ccm_remove () - raises (CCMException); - }; - - - local interface HomeExecutorBase - { - }; -}; -#endif /* CCM_CONTAINER_IDL */ diff --git a/TAO/CIAO/DnC/ciao/CCM_Container_Ex.idl b/TAO/CIAO/DnC/ciao/CCM_Container_Ex.idl deleted file mode 100644 index 0aeb481807d..00000000000 --- a/TAO/CIAO/DnC/ciao/CCM_Container_Ex.idl +++ /dev/null @@ -1,183 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_CONTAINER_EX_IDL) -#define CCM_CONTAINER_EX_IDL - -#include "CCM_Container.idl" -#include <CosPersistentState.idl> - -// *************** Extended Container Interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - enum BadComponentReferenceReason - { - NON_LOCAL_REFERENCE, - NON_COMPONENT_REFERENCE, - WRONG_CONTAINER - }; - - typedef CosPersistentState::CatalogBase CatalogBase; - typedef CosPersistentState::_TypeId _TypeId; - - typedef short SegmentId; - const SegmentId COMPONENT_SEGMENT = 0; - - typedef short FacetId; - const FacetId COMPONENT_FACET = 0; - - typedef sequence<octet> IdData; - typedef CosPersistentState::Pid PersistentId; - - typedef short StateIdType; - const StateIdType PERSISTENT_ID = 0; - - exception BadComponentReference - { - BadComponentReferenceReason reason; - }; - exception PolicyMismatch {}; - exception PersistenceNotAvailable {}; - exception UnknownActualHome {}; - exception ProxyHomeNotSupported {}; - exception InvalidStateIdData {}; - - local interface HomeRegistration - { - void register_home (in CCMHome home_ref, - in string home_name); - - void unregister_home (in CCMHome home_ref); - }; - - local interface CCM2Context : CCMContext - { - HomeRegistration get_home_registration (); - - void req_passivate () - raises (PolicyMismatch); - - CatalogBase get_persistence (in _TypeId catalog_type_id) - raises (PersistenceNotAvailable); - }; - - local interface ProxyHomeRegistration : HomeRegistration - { - void register_proxy_home (in CCMHome rhome, - in CCMHome ahome) - raises (UnknownActualHome, - ProxyHomeNotSupported); - }; - - local interface Session2Context : SessionContext, CCM2Context - { - Object create_ref (in CORBA::RepositoryId repid); - - Object create_ref_from_oid (in CORBA::OctetSeq oid, - in CORBA::RepositoryId repid); - - CORBA::OctetSeq get_oid_from_ref (in Object objref) - raises (IllegalState, - BadComponentReference); - }; - - abstract valuetype StateIdValue - { - StateIdType get_sid_type(); - IdData get_sid_data(); - }; - - local interface StateIdFactory - { - StateIdValue create (in IdData data) - raises (InvalidStateIdData); - }; - - valuetype PersistentIdValue : StateIdValue - { - private PersistentId pid; - - PersistentId get_pid(); - factory init (in PersistentId pid); - }; - - valuetype SegmentDescr - { - private StateIdValue sid; - private SegmentId seg; - - StateIdValue get_sid(); - SegmentId get_seg_id(); - factory init (in StateIdValue sid, - in SegmentId seg); - }; - - typedef sequence<SegmentDescr> SegmentDescrSeq; - - local interface ComponentId - { - FacetId get_target_facet(); - - SegmentId get_target_segment(); - - StateIdValue get_target_state_id (in StateIdFactory sid_factory) - raises (InvalidStateIdData); - - StateIdValue get_segment_state_id (in SegmentId seg, - in StateIdFactory sid_factory) - raises (InvalidStateIdData); - - ComponentId create_with_new_target (in FacetId new_target_facet, - in SegmentId new_target_segment); - - SegmentDescrSeq get_segment_descrs (in StateIdFactory sid_factory) - raises (InvalidStateIdData); - }; - - local interface Entity2Context : EntityContext, CCM2Context - { - ComponentId get_component_id () - raises (IllegalState); - - ComponentId create_component_id (in FacetId target_facet, - in SegmentId target_segment, - in SegmentDescrSeq seq_descrs); - - ComponentId create_monolithic_component_id (in FacetId target_facet, - in StateIdValue sid); - - Object create_ref_from_cid (in CORBA::RepositoryId repid, - in ComponentId cid); - - ComponentId get_cid_from_ref (in Object objref) - raises (BadComponentReference); - }; - - local interface ExecutorLocator : EnterpriseComponent - { - Object obtain_executor (in string name) - raises (CCMException); - - void release_executor (in Object exc) - raises (CCMException); - - void configuration_complete() - raises (InvalidConfiguration); - }; -}; -#endif /* CCM_CONTAINER_EX_IDL */ diff --git a/TAO/CIAO/DnC/ciao/CCM_Core.mpc b/TAO/CIAO/DnC/ciao/CCM_Core.mpc deleted file mode 100644 index ac1774a1e36..00000000000 --- a/TAO/CIAO/DnC/ciao/CCM_Core.mpc +++ /dev/null @@ -1,131 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client { - sharedname = CIAO_DnC_Client - idlflags += -Wb,stub_export_include=CIAO_Client_Export.h - idlflags += -Wb,stub_export_macro=CIAO_CLIENT_Export - idlflags += -Wb,skel_export_include=CIAO_Container_Export.h - idlflags += -Wb,skel_export_macro=CIAO_CONTAINER_Export - - dynamicflags = CIAO_CLIENT_BUILD_DLL - - IDL_Files { - CCM_Base.idl - CCM_Event.idl - CCM_Component.idl - CIAO_Value.idl - } - - Source_Files { - CCM_BaseC.cpp - CCM_EventC.cpp - CCM_ComponentC.cpp - CIAO_ValueC.cpp - Client_init.cpp - } - - Header_Files { - CIAO_Client_Export.h - CIAO_common.h - } -} - -project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, iorinterceptor, objreftemplate, valuetype, ifr_client { - after += CIAO_DnC_Client - sharedname = CIAO_DnC_Container - libs += CIAO_DnC_Client - idlflags += -Wb,export_include=CIAO_Container_Export.h - idlflags += -Wb,export_macro=CIAO_CONTAINER_Export - dynamicflags = CIAO_CONTAINER_BUILD_DLL - - IDL_Files { - CCM_Transaction.idl - CosPersistentState.idl - CCM_Container.idl - CCM_Container_Ex.idl - } - - Source_Files { - CCM_TransactionC.cpp - CosPersistentStateC.cpp - CCM_ContainerC.cpp - CCM_Container_ExC.cpp - CCM_BaseS.cpp - CCM_EventS.cpp - CCM_ComponentS.cpp - Cookies.cpp - } -} - -project (CIAO_DnC_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security { - after += CIAO_DnC_Container - sharedname = CIAO_DnC_Server - libs += CIAO_DnC_Client CIAO_DnC_Container - idlflags += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export - dynamicflags = CIAO_SERVER_BUILD_DLL - - IDL_Files { - Deployment_Core.idl - } - - Source_Files { - Deployment_CoreC.cpp - Deployment_CoreS.cpp - Container_Base.cpp - NodeApplication_Impl.cpp - Server_init.cpp - Servant_Impl_Base.cpp - } - - Header_Files { - CIAO_Server_Export.h - CIAO_common.h - } - - Template_Files { - Servant_Impl_T.cpp - } -} - -project(Deployment_stub) : taolib_with_idl, valuetype , ciao_server_dnc { - sharedname = Deployment_stub - - idlflags += -Wb,stub_export_macro=Deployment_stub_Export - idlflags += -Wb,stub_export_include=Deployment_stub_export.h - idlflags += -Wb,skel_export_macro=Deployment_svnt_Export - idlflags += -Wb,skel_export_include=Deployment_svnt_export.h - idlflags += -St - - dynamicflags = DEPLOYMENT_STUB_BUILD_DLL - - IDL_Files { - Deployment.idl - NodeApplication_CallBack.idl - } - - Source_Files { - DeploymentC.cpp - NodeApplication_CallBackC.cpp - } -} - -project(Deployment_svnt) : taolib_with_idl, portableserver, ciao_server_dnc { - after += Deployment_stub - sharedname = Deployment_svnt - dynamicflags = DEPLOYMENT_SVNT_BUILD_DLL - libs += Deployment_stub - idlflags += -Wb,stub_export_macro=Deployment_stub_Export - idlflags += -Wb,stub_export_include=Deployment_stub_export.h - idlflags += -Wb,skel_export_macro=Deployment_svnt_Export - idlflags += -Wb,skel_export_include=Deployment_svnt_export.h - - IDL_Files { - } - - Source_Files { - DeploymentS.cpp - NodeApp_CB_Impl.cpp - NodeApplication_CallBackS.cpp - } -} diff --git a/TAO/CIAO/DnC/ciao/CCM_Event.idl b/TAO/CIAO/DnC/ciao/CCM_Event.idl deleted file mode 100644 index 7773eedd186..00000000000 --- a/TAO/CIAO/DnC/ciao/CCM_Event.idl +++ /dev/null @@ -1,100 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Event.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_EVENT_IDL) -#define CCM_EVENT_IDL - -#include "CCM_Base.idl" - -module Components -{ - typeprefix Components "omg.org"; - - abstract valuetype EventBase {}; - - interface EventConsumerBase - { - void push_event (in EventBase evt) raises (BadEventType); - }; - - valuetype ConsumerDescription : PortDescription - { - public EventConsumerBase consumer; - }; - typedef sequence<ConsumerDescription> ConsumerDescriptions; - - valuetype EmitterDescription : PortDescription - { - public EventConsumerBase consumer; - }; - typedef sequence<EmitterDescription> EmitterDescriptions; - - valuetype SubscriberDescription - { - public Cookie ck; - public EventConsumerBase consumer; - }; - typedef sequence<SubscriberDescription> SubscriberDescriptions; - - valuetype PublisherDescription : PortDescription - { - public SubscriberDescriptions consumer; - }; - typedef sequence<PublisherDescription> PublisherDescriptions; - - interface Events - { - EventConsumerBase get_consumer (in FeatureName sink_name) - raises (InvalidName); - - Cookie subscribe (in FeatureName publisher_name, - in EventConsumerBase subscriber) - raises (InvalidName, - AlreadyConnected, - InvalidConnection, - ExceededConnectionLimit); - - EventConsumerBase unsubscribe (in FeatureName publisher_name, - in Cookie ck) - raises (InvalidName, - InvalidConnection); - - void connect_consumer (in FeatureName emitter_name, - in EventConsumerBase consumer) - raises (InvalidName, - AlreadyConnected, - InvalidConnection); - - EventConsumerBase disconnect_consumer (in FeatureName source_name) - raises (InvalidName, - NoConnection); - - ConsumerDescriptions get_all_consumers (); - - ConsumerDescriptions get_named_consumers (in NameList names) - raises (InvalidName); - - EmitterDescriptions get_all_emitters (); - - EmitterDescriptions get_named_emitters (in NameList names) - raises (InvalidName); - - PublisherDescriptions get_all_publishers (); - - PublisherDescriptions get_named_publishers (in NameList names) - raises (InvalidName); - }; -}; -#endif /* CCM_EVENT_IDL */ diff --git a/TAO/CIAO/DnC/ciao/CCM_Transaction.idl b/TAO/CIAO/DnC/ciao/CCM_Transaction.idl deleted file mode 100644 index c0c8cdc2c1d..00000000000 --- a/TAO/CIAO/DnC/ciao/CCM_Transaction.idl +++ /dev/null @@ -1,89 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Transaction.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_TRANSACTION_IDL) -#define CCM_TRANSACTION_IDL - -module Components -{ - typeprefix Components "omg.org"; - - // @@ Components::Transaction is still there. - module Transaction - { - - typedef sequence<octet> TranToken; - - exception NoTransaction {}; - exception NotSupported {}; - exception SystemError {}; - exception RollbackError {}; - exception HeuristicMixed {}; - exception HeuristicRollback {}; - exception Security {}; - exception InvalidToken {}; - - enum Status - { - ACTIVE, - MARKED_ROLLBACK, - PREPARED, - COMMITTED, - ROLLED_BACK, - NO_TRANSACTION, - PREPARING, - COMMITTING, - ROLLING_BACK - }; - - local interface UserTransaction { - void begin () - raises (NotSupported, - SystemError); - - void commit () - raises (RollbackError, - NoTransaction, - HeuristicMixed, - HeuristicRollback, - Security, - SystemError); - - void rollback () - raises (NoTransaction, - Security, - SystemError); - - void set_rollback_only () - raises (NoTransaction, - SystemError); - - Status get_status() - raises (SystemError); - - void set_timeout (in long to) - raises (SystemError); - - TranToken suspend () - raises (NoTransaction, - SystemError); - - void resume (in TranToken txtoken) - raises (InvalidToken, - SystemError); - }; - }; -}; -#endif /* CCM_TRANSACTION_IDL */ diff --git a/TAO/CIAO/DnC/ciao/CIAO_Client_Export.h b/TAO/CIAO/DnC/ciao/CIAO_Client_Export.h deleted file mode 100644 index a566e94b0c2..00000000000 --- a/TAO/CIAO/DnC/ciao/CIAO_Client_Export.h +++ /dev/null @@ -1,50 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_CLIENT -// ------------------------------ -#ifndef CIAO_CLIENT_EXPORT_H -#define CIAO_CLIENT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (CIAO_CLIENT_HAS_DLL) -# define CIAO_CLIENT_HAS_DLL 1 -#endif /* ! CIAO_CLIENT_HAS_DLL */ - -#if defined (CIAO_CLIENT_HAS_DLL) && (CIAO_CLIENT_HAS_DLL == 1) -# if defined (CIAO_CLIENT_BUILD_DLL) -# define CIAO_CLIENT_Export ACE_Proper_Export_Flag -# define CIAO_CLIENT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_CLIENT_BUILD_DLL */ -# define CIAO_CLIENT_Export ACE_Proper_Import_Flag -# define CIAO_CLIENT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_CLIENT_BUILD_DLL */ -#else /* CIAO_CLIENT_HAS_DLL == 1 */ -# define CIAO_CLIENT_Export -# define CIAO_CLIENT_SINGLETON_DECLARATION(T) -# define CIAO_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_CLIENT_HAS_DLL == 1 */ - -// Set CIAO_CLIENT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_CLIENT_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_CLIENT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_CLIENT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_CLIENT_NTRACE */ - -#if (CIAO_CLIENT_NTRACE == 1) -# define CIAO_CLIENT_TRACE(X) -#else /* (CIAO_CLIENT_NTRACE == 1) */ -# define CIAO_CLIENT_TRACE(X) ACE_TRACE_IMPL(X) -#endif /* (CIAO_CLIENT_NTRACE == 1) */ - -#endif /* CIAO_CLIENT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/ciao/CIAO_Container_Export.h b/TAO/CIAO/DnC/ciao/CIAO_Container_Export.h deleted file mode 100644 index 74ba838721d..00000000000 --- a/TAO/CIAO/DnC/ciao/CIAO_Container_Export.h +++ /dev/null @@ -1,50 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_CONTAINER -// ------------------------------ -#ifndef CIAO_CONTAINER_EXPORT_H -#define CIAO_CONTAINER_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (CIAO_CONTAINER_HAS_DLL) -# define CIAO_CONTAINER_HAS_DLL 1 -#endif /* ! CIAO_CONTAINER_HAS_DLL */ - -#if defined (CIAO_CONTAINER_HAS_DLL) && (CIAO_CONTAINER_HAS_DLL == 1) -# if defined (CIAO_CONTAINER_BUILD_DLL) -# define CIAO_CONTAINER_Export ACE_Proper_Export_Flag -# define CIAO_CONTAINER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_CONTAINER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_CONTAINER_BUILD_DLL */ -# define CIAO_CONTAINER_Export ACE_Proper_Import_Flag -# define CIAO_CONTAINER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_CONTAINER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_CONTAINER_BUILD_DLL */ -#else /* CIAO_CONTAINER_HAS_DLL == 1 */ -# define CIAO_CONTAINER_Export -# define CIAO_CONTAINER_SINGLETON_DECLARATION(T) -# define CIAO_CONTAINER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_CONTAINER_HAS_DLL == 1 */ - -// Set CIAO_CONTAINER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_CONTAINER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_CONTAINER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_CONTAINER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_CONTAINER_NTRACE */ - -#if (CIAO_CONTAINER_NTRACE == 1) -# define CIAO_CONTAINER_TRACE(X) -#else /* (CIAO_CONTAINER_NTRACE == 1) */ -# define CIAO_CONTAINER_TRACE(X) ACE_TRACE_IMPL(X) -#endif /* (CIAO_CONTAINER_NTRACE == 1) */ - -#endif /* CIAO_CONTAINER_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/ciao/CIAO_Server_Export.h b/TAO/CIAO/DnC/ciao/CIAO_Server_Export.h deleted file mode 100644 index 2f0145331e9..00000000000 --- a/TAO/CIAO/DnC/ciao/CIAO_Server_Export.h +++ /dev/null @@ -1,50 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_SERVER -// ------------------------------ -#ifndef CIAO_SERVER_EXPORT_H -#define CIAO_SERVER_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (CIAO_SERVER_HAS_DLL) -# define CIAO_SERVER_HAS_DLL 1 -#endif /* ! CIAO_SERVER_HAS_DLL */ - -#if defined (CIAO_SERVER_HAS_DLL) && (CIAO_SERVER_HAS_DLL == 1) -# if defined (CIAO_SERVER_BUILD_DLL) -# define CIAO_SERVER_Export ACE_Proper_Export_Flag -# define CIAO_SERVER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_SERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_SERVER_BUILD_DLL */ -# define CIAO_SERVER_Export ACE_Proper_Import_Flag -# define CIAO_SERVER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_SERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_SERVER_BUILD_DLL */ -#else /* CIAO_SERVER_HAS_DLL == 1 */ -# define CIAO_SERVER_Export -# define CIAO_SERVER_SINGLETON_DECLARATION(T) -# define CIAO_SERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_SERVER_HAS_DLL == 1 */ - -// Set CIAO_SERVER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_SERVER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_SERVER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_SERVER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_SERVER_NTRACE */ - -#if (CIAO_SERVER_NTRACE == 1) -# define CIAO_SERVER_TRACE(X) -#else /* (CIAO_SERVER_NTRACE == 1) */ -# define CIAO_SERVER_TRACE(X) ACE_TRACE_IMPL(X) -#endif /* (CIAO_SERVER_NTRACE == 1) */ - -#endif /* CIAO_SERVER_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/ciao/CIAO_Value.idl b/TAO/CIAO/DnC/ciao/CIAO_Value.idl deleted file mode 100644 index 52efed12f75..00000000000 --- a/TAO/CIAO/DnC/ciao/CIAO_Value.idl +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ - -/** - * @file CIAO_Value.idl - * - * @brief Some CIAO valuetype extension for internal use. - */ - -#include "CCM_Base.idl" - -/** - * @ Note: This needs deprecation. - * - */ -module CIAO -{ - valuetype Cookie : Components::Cookie - { - CORBA::OctetSeq get_cookie (); - }; -}; diff --git a/TAO/CIAO/DnC/ciao/CIAO_common.h b/TAO/CIAO/DnC/ciao/CIAO_common.h deleted file mode 100644 index e933c75fe32..00000000000 --- a/TAO/CIAO/DnC/ciao/CIAO_common.h +++ /dev/null @@ -1,53 +0,0 @@ -// $Id$ - -/** - * @file CIAO_common.h - * - * This file collects common CIAO macro definitions. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - */ - -#ifndef CIAO_COMMON_H -#define CIAO_COMMON_H -#include /**/ "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#include "CIAO_Client_Export.h" - -#define CIAO_REGISTER_VALUE_FACTORY(ORB,FACTORY,VALUETYPE) {\ - CORBA::ValueFactory factory = new FACTORY; \ - CORBA::ValueFactory prev_factory = \ - ORB->register_value_factory \ - (VALUETYPE::_tao_obv_static_repository_id (), \ - factory); \ - if (prev_factory) prev_factory->_remove_ref (); \ - factory->_remove_ref (); } - -namespace CIAO -{ - /** - * Return the debug level. The debug level of CIAO is control by - * an environment variable "CIAO_DEBUG_LEVEL". It should be an int - * value. If it is not defined, the default debug level is 0. The - * value of debug value is evaluated on its first use and the value - * is then cached. The actual implementation of this function is in - * Client_init.cpp. - * - * Some recommendation for using the debug_level - * - * > 0 : For component users. Component developers are encouraged - * to develop their own - * > 10 : For CIAO tools - * > 20 : For CIAO core. - */ - CIAO_CLIENT_Export int debug_level (void); -} - -#include /**/ "ace/post.h" -#endif /* CIAO_COMMON_H */ diff --git a/TAO/CIAO/DnC/ciao/Client_init.cpp b/TAO/CIAO/DnC/ciao/Client_init.cpp deleted file mode 100644 index 7dd0b874b54..00000000000 --- a/TAO/CIAO/DnC/ciao/Client_init.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// $Id$ - -#include "Client_init.h" -#include "CIAO_common.h" -#include "CCM_ComponentC.h" -#include "CIAO_ValueC.h" -#include "ace/Env_Value_T.h" - -int -CIAO::Client_init (CORBA::ORB_ptr o) -{ - CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init, - Components::Cookie); - CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init, - CIAO::Cookie); - CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init, - Components::PortDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init, - Components::FacetDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init, - Components::ConnectionDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init, - Components::ReceptacleDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init, - Components::ConsumerDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init, - Components::EmitterDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init, - Components::SubscriberDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init, - Components::PublisherDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init, - Components::ConfigValue); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init, - Components::ComponentPortDescription); - return 0; -} - -/// This should really be an anonymous namespace, but some compilers -/// still don't support this features. Therefore, just use a long -/// namespace name here. -namespace ciao_anonymous_namespace -{ - int debug_level = -1; -} - -int -CIAO::debug_level (void) -{ - if (ciao_anonymous_namespace::debug_level == -1) - { - // Initialize the thing. - ACE_Env_Value<int> envar ("CIAO_DEBUG_LEVEL", 1); - ciao_anonymous_namespace::debug_level = envar; - } - - return ciao_anonymous_namespace::debug_level; -} diff --git a/TAO/CIAO/DnC/ciao/Client_init.h b/TAO/CIAO/DnC/ciao/Client_init.h deleted file mode 100644 index 065c1f2a280..00000000000 --- a/TAO/CIAO/DnC/ciao/Client_init.h +++ /dev/null @@ -1,40 +0,0 @@ -// $Id$ - -/** - * @file Client_init.h - * - * Initializing CIAO client side ORB, if they need to. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - */ - -#ifndef CIAO_CLIENT_INIT_H -#define CIAO_CLIENT_INIT_H -#include /**/ "ace/pre.h" - -#include "CIAO_Client_Export.h" - -#if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -namespace CORBA -{ - class ORB; - typedef ORB *ORB_ptr; -} - -namespace CIAO -{ - /** - * The initialize routine for any clients that need to access - * component. This routine now simply registers various valuetype - * factories defined in CIAO_Component.pidl. Currently, this method - * should be call right after ORB initialization but we should try - * to register these stuff automatically. - */ - CIAO_CLIENT_Export int Client_init (CORBA::ORB_ptr o); -} - -#include /**/ "ace/post.h" -#endif /* CIAO_CLIENT_INIT_H */ diff --git a/TAO/CIAO/DnC/ciao/Components.idl b/TAO/CIAO/DnC/ciao/Components.idl deleted file mode 100644 index 3846f59685b..00000000000 --- a/TAO/CIAO/DnC/ciao/Components.idl +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -/** - * @@ This file is included in the generated executor - * mapping IDL file, and for now just includes - * CCM_Container.idl. - */ - -#if !defined (CIAO_COMPONENTS_IDL) -#define CIAO_COMPONENTS_IDL - -#include "CCM_Container.idl" - -#endif /* CIAO_COMPONENTS_IDL */ - diff --git a/TAO/CIAO/DnC/ciao/ComponentsC.h b/TAO/CIAO/DnC/ciao/ComponentsC.h deleted file mode 100644 index 32e5a755e83..00000000000 --- a/TAO/CIAO/DnC/ciao/ComponentsC.h +++ /dev/null @@ -1,99 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:150 - -#ifndef _TAO_IDL_COMPONENTSC_H_ -#define _TAO_IDL_COMPONENTSC_H_ - -#include "tao/ORB.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CDR.h" -#include "tao/Environment.h" -#include "tao/Typecode.h" - -#include "CCM_ContainerC.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO - -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO -#endif /* TAO_EXPORT_NESTED_CLASSES */ - -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be/be_visitor_traits.cpp:50 - -// Traits specializations. -namespace TAO -{ -}; - -// TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:48 - -#ifndef __ACE_INLINE__ - -// TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:64 - -#endif /* __ACE_INLINE__ */ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:911 - - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#endif /* ifndef */ diff --git a/TAO/CIAO/DnC/ciao/ComponentsS.h b/TAO/CIAO/DnC/ciao/ComponentsS.h deleted file mode 100644 index 5463db3326b..00000000000 --- a/TAO/CIAO/DnC/ciao/ComponentsS.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:390 - -#ifndef _TAO_IDL_COMPONENTSS_H_ -#define _TAO_IDL_COMPONENTSS_H_ - - -#include "CCM_ContainerS.h" -#include "ComponentsC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Collocation_Proxy_Broker.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Base.h" - -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#endif /* ifndef */ diff --git a/TAO/CIAO/DnC/ciao/Container_Base.cpp b/TAO/CIAO/DnC/ciao/Container_Base.cpp deleted file mode 100644 index 794e3927437..00000000000 --- a/TAO/CIAO/DnC/ciao/Container_Base.cpp +++ /dev/null @@ -1,301 +0,0 @@ -// $Id$ - -#include "Container_Base.h" -#include "ace/DLL.h" -#include "ace/OS_NS_stdio.h" - -#if !defined (__ACE_INLINE__) -# include "Container_Base.inl" -#endif /* __ACE_INLINE__ */ - -//////////////////////////////////////////////////////////////// - -CIAO::Container::Container (CORBA::ORB_ptr o) - : orb_ (CORBA::ORB::_duplicate (o)) -{ -} - -CIAO::Container::~Container () -{ -} - -PortableServer::POA_ptr -CIAO::Container::_ciao_the_POA (void) -{ - return this->poa_.in (); -} - -CORBA::ORB_ptr -CIAO::Container::_ciao_the_ORB () -{ - return this->orb_.in (); -} - -/////////////////////////////////////////////////////////////// - -ACE_Atomic_Op <ACE_SYNCH_MUTEX, long> -CIAO::Session_Container::serial_number_ (0); - -CIAO::Session_Container::Session_Container (CORBA::ORB_ptr o, - int static_config_flag, - const Static_Config_EntryPoints_Maps* maps - ) - : Container (o), - number_ (0), - static_config_flag_ (static_config_flag), - static_entrypts_maps_ (maps) -{ -} - -CIAO::Session_Container::~Session_Container () -{ -} - -int -CIAO::Session_Container::init (const char *name, - const CORBA::PolicyList *more_policies - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - char buffer[MAXPATHLEN]; - - if (name == 0) - { - this->number_ = ++CIAO::Session_Container::serial_number_; - ACE_OS::sprintf (buffer, "CIAO::Session_Container-%ld", - this->number_); - name = buffer; - } - - CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - -1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - // Set up proper poa policies here. Default policies seems to be - // fine for session container. If you add some other default - // policies here, then you need to "add" more_policies below - // instead of simply assigning more_policies to the init policy - // list. - CORBA::PolicyList policies (0); - - if (more_policies != 0) - policies = *more_policies; - - this->poa_ = root_poa->create_POA (name, - PortableServer::POAManager::_nil (), - policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - return 0; -} - -CORBA::Object_ptr -CIAO::Session_Container::install_servant (PortableServer::Servant p - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - PortableServer::ObjectId_var oid - = this->poa_->activate_object (p - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - CORBA::Object_var objref - = this->poa_->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return objref._retn (); -} - -CORBA::Object_ptr -CIAO::Session_Container::install_component (PortableServer::Servant p, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - PortableServer::ObjectId_var id - = this->poa_->activate_object (p - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - CORBA::Object_var objref - = this->poa_->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - oid = id._retn (); - - return objref._retn (); -} - - -//@@ Apparently we need to be cautious when handling the exception -// thrown here. We should make sure that new DnC interfaces -// NodeApplication/NodeApplicationManager etc will cache the new -// exceptions--> rethrow of new exceptions is needed. -// --Tao -Components::CCMHome_ptr -CIAO::Session_Container::ciao_install_home (const char *exe_dll_name, - const char *exe_entrypt, - const char *sv_dll_name, - const char *sv_entrypt - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InstallationFailure)) -{ - - HomeFactory hcreator = 0; - ServantFactory screator = 0; - - if (this->static_config_flag_ == 0) - { - ACE_DLL executor_dll, servant_dll; - - if (exe_dll_name == 0 || sv_dll_name == 0) - ACE_THROW_RETURN (Deployment::UnknownImplId (), - Components::CCMHome::_nil ()); - - if (executor_dll.open (exe_dll_name, - ACE_DEFAULT_SHLIB_MODE, - 0) != 0 - || servant_dll.open (sv_dll_name, - ACE_DEFAULT_SHLIB_MODE, - 0) != 0) - { - ACE_THROW_RETURN (Deployment::UnknownImplId (), - Components::CCMHome::_nil ()); - } - - if (exe_entrypt == 0 || sv_entrypt == 0) - ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (), - Components::CCMHome::_nil ()); - - // @@ (OO) Please use a static_cast<> here instead of a C-style - // cast. ANSI C++ casts are the preferred (and modern) - // way of casting in ACE/TAO/CIAO. - hcreator = (HomeFactory) executor_dll.symbol (exe_entrypt); - screator = (ServantFactory) servant_dll.symbol (sv_entrypt); - } - else - { - if (static_entrypts_maps_ == 0 || - static_entrypts_maps_->home_creator_funcptr_map_ == 0 || - static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0) - ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (), - Components::CCMHome::_nil ()); - - ACE_CString exe_entrypt_str (exe_entrypt); - static_entrypts_maps_->home_creator_funcptr_map_-> - find (exe_entrypt_str, hcreator); - - ACE_CString sv_entrypt_str (sv_entrypt); - static_entrypts_maps_->home_servant_creator_funcptr_map_-> - find (sv_entrypt_str, screator); - } - - if (hcreator == 0 || screator == 0) - ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (), - Components::CCMHome::_nil ()); - - Components::HomeExecutorBase_var home_executor = hcreator (); - if (CORBA::is_nil (home_executor.in ())) - ACE_THROW_RETURN (Deployment::InstallationFailure (), - Components::CCMHome::_nil ()); - - PortableServer::Servant home_servant = screator (home_executor.in (), - this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Components::CCMHome::_nil ()); - - if (home_servant == 0) - ACE_THROW_RETURN (Deployment::InstallationFailure (), - Components::CCMHome::_nil ()); - - PortableServer::ServantBase_var safe (home_servant); - - CORBA::Object_var objref = this->install_servant (home_servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Components::CCMHome::_nil ()); - - Components::CCMHome_var homeref = - Components::CCMHome::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return homeref._retn (); - -} - -void -CIAO::Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->uninstall (homeref - ACE_ENV_ARG_PARAMETER); -} - -void -CIAO::Session_Container::uninstall (CORBA::Object_ptr objref - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - PortableServer::ObjectId_var oid - = this->poa_->reference_to_id (objref - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - this->poa_->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); -} - -void -CIAO::Session_Container::uninstall (PortableServer::Servant svt - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - PortableServer::ObjectId_var oid - = this->poa_->servant_to_id (svt - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - this->poa_->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); -} - -void -CIAO::Session_Container::uninstall_component (Components::CCMObject_ptr objref, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - PortableServer::ObjectId_var id - = this->poa_->reference_to_id (objref - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - this->poa_->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - oid = id._retn (); -} diff --git a/TAO/CIAO/DnC/ciao/Container_Base.h b/TAO/CIAO/DnC/ciao/Container_Base.h deleted file mode 100644 index fe25c4ab113..00000000000 --- a/TAO/CIAO/DnC/ciao/Container_Base.h +++ /dev/null @@ -1,234 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Container_Base.h - * - * $Id$ - * - * Header file for CIAO's container implementations - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - */ -//============================================================================= - - -#ifndef CIAO_CONTAINER_BASE_H -#define CIAO_CONTAINER_BASE_H -#include /**/ "ace/pre.h" - -#include "tao/ORB.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Base.h" -#include "CCM_ContainerC.h" -#include "Deployment_CoreC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -namespace CIAO -{ - /** - * @class Container - * - * @brief Common container interface definition. - * - * Perhaps we can use local interface to define these interfaces as - * we will also get reference counting automatically. - */ - class CIAO_SERVER_Export Container - { - public: - Container (CORBA::ORB_ptr o); - - virtual ~Container (void) = 0; - - /// Get the containing POA. This operation does *NOT* - /// increase the reference count of the POA. - virtual PortableServer::POA_ptr _ciao_the_POA (void); - - /// Get a reference to the underlying ORB. - virtual CORBA::ORB_ptr _ciao_the_ORB (void); - - /// Initialize the container with a name. - virtual int init (const char *name = 0, - const CORBA::PolicyList *more_policies = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - - /// Install a new home - virtual Components::CCMHome_ptr ciao_install_home - (const char *exe_dll_name, - const char *exe_entrypt, - const char *sv_dll_name, - const char *sv_entrypt - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InstallationFailure)) = 0; - - // Uninstall a servant for component or home. - virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - - // Uninstall a servant for component. - virtual void uninstall_component (::Components::CCMObject_ptr objref, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - - protected: - CORBA::ORB_var orb_; - - PortableServer::POA_var poa_; - }; - - class Session_Container; - - typedef ::Components::HomeExecutorBase_ptr (*HomeFactory) (void); - typedef ::PortableServer::Servant (*ServantFactory) - (::Components::HomeExecutorBase_ptr p, - ::CIAO::Session_Container *c - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - HomeFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> HOMECREATOR_FUNCPTR_MAP; - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - ServantFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> HOMESERVANTCREATOR_FUNCPTR_MAP; - - struct Static_Config_EntryPoints_Maps - { - /// Map of home creator entry point name and func ptr - HOMECREATOR_FUNCPTR_MAP* home_creator_funcptr_map_; - - /// Map of home servant creator entry point name and func ptr - HOMESERVANTCREATOR_FUNCPTR_MAP* home_servant_creator_funcptr_map_; - }; - - class CIAO_SERVER_Export Session_Container : public Container - { - public: - - // @@ (OO) Does the static_config_flag really need to be an int? - // It appears to be a boolean value. Please use bool - // instead. - Session_Container (CORBA::ORB_ptr o, - int static_config_flag =0, - const Static_Config_EntryPoints_Maps* static_entrypts_maps =0 - ); - - virtual ~Session_Container (void); - - /// Initialize the container with a name. - virtual int init (const char *name = 0, - const CORBA::PolicyList *more_policies = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /** - * @brief Simply installing a home executor into the component. - * - * This operation install a home executor into the component. It - * requires the name of the DLLs to executor and the servant glue - * code, and the entry points to the respective DLLs. Currently, - * we don't try to manage the lifetime of DLL objects, but we - * should at some later point. - * - * @retval Home objref of the installed home. - */ - virtual Components::CCMHome_ptr ciao_install_home - (const char *exe_dll_name, - const char *exe_entrypt, - const char *sv_dll_name, - const char *sv_entrypt - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InstallationFailure)); - - // Uninstall a servant for component or home. - virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Uninstall a servant for component. - virtual void uninstall_component (::Components::CCMObject_ptr objref, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Install a servant for component or home. - CORBA::Object_ptr install_servant (PortableServer::Servant p - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Install a component servant. - CORBA::Object_ptr install_component (PortableServer::Servant p, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Get an object reference to a component or home from the servant. - CORBA::Object_ptr get_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Uninstall a servant for component or home. - void uninstall (CORBA::Object_ptr objref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Uninstall a servant for component or home. - void uninstall (PortableServer::Servant svt - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - protected: - long number_; - - static ACE_Atomic_Op <ACE_SYNCH_MUTEX, long> serial_number_; - - // @@ (OO) Does this really need to be an int? It appears to be a - // boolean value. Please use bool instead. - // - // It looks like it can also be declared const, as well. - int static_config_flag_; - const Static_Config_EntryPoints_Maps* static_entrypts_maps_; - }; -} - -// Macro for registration of an OBV factory in the generated -// servant class. Similar to the macro for TAO in -// tao/ValueType/ValueFactory.h but here we take advantage of -// the fact that we have access to the current ORB indirectly -// through the context and container. -#define CIAO_REGISTER_OBV_FACTORY(FACTORY, VALUETYPE) \ - { \ - CORBA::ValueFactory factory = new FACTORY; \ - CORBA::ORB_ptr orb = \ - this->context_->_ciao_the_Container ()->_ciao_the_ORB (); \ - CORBA::ValueFactory prev_factory = \ - orb->register_value_factory ( \ - VALUETYPE::_tao_obv_static_repository_id (), \ - factory); \ - CORBA::remove_ref (prev_factory); \ - CORBA::add_ref (factory); \ - } - -#if defined (__ACE_INLINE__) -# include "Container_Base.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" -#endif /* CIAO_CONTAINER_BASE_H */ diff --git a/TAO/CIAO/DnC/ciao/Container_Base.inl b/TAO/CIAO/DnC/ciao/Container_Base.inl deleted file mode 100644 index 5435a481075..00000000000 --- a/TAO/CIAO/DnC/ciao/Container_Base.inl +++ /dev/null @@ -1,10 +0,0 @@ -// $Id$ -*- C++ -*- - -ACE_INLINE CORBA::Object_ptr -CIAO::Session_Container::get_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return this->_ciao_the_POA ()->servant_to_reference (p - ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/CIAO/DnC/ciao/Container_Base.pidl b/TAO/CIAO/DnC/ciao/Container_Base.pidl deleted file mode 100644 index e698ea66b45..00000000000 --- a/TAO/CIAO/DnC/ciao/Container_Base.pidl +++ /dev/null @@ -1,33 +0,0 @@ -// $Id$ - -/** - * CIAO's internal container interface definitions. - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CONTAINER_BASE_PIDL) -#define CONTAINER_BASE_PIDL - -#include "CIAO_Component.pidl" -#include <SecurityLevel2.idl> -#include "CIAO_Transaction.pidl" - -// *************** Basic Container interfaces *************** - -module CIAO -{ - typeprefix Components "wustl.edu"; - - local interface Container - { - // Return the POA - PortableServer::POA the_POA (); - }; - - local interface SessionContainer - { - - }; -}; -#endif /* CONTAINER_BASE_PIDL */ diff --git a/TAO/CIAO/DnC/ciao/Cookies.cpp b/TAO/CIAO/DnC/ciao/Cookies.cpp deleted file mode 100644 index 4a319577be4..00000000000 --- a/TAO/CIAO/DnC/ciao/Cookies.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// $Id$ -#include "Cookies.h" - -#if !defined (__ACE_INLINE__) -#include "Cookies.inl" -#endif /* !defined INLINE */ - -ACE_RCSID (ciao, - Cookies, - "$Id$") - -namespace CIAO -{ - Map_Key_Cookie::Map_Key_Cookie (const ACE_Active_Map_Manager_Key &key) - { - this->cookieValue ().length (ACE_Active_Map_Manager_Key::size ()); - key.encode (this->cookieValue ().get_buffer (0)); - } - - Map_Key_Cookie::~Map_Key_Cookie (void) - { - } - - bool - Map_Key_Cookie::insert (ACE_Active_Map_Manager_Key &key) - { - this->cookieValue ().length (ACE_Active_Map_Manager_Key::size ()); - key.encode (this->cookieValue ().get_buffer (0)); - return true; - } - - bool - Map_Key_Cookie::extract (::Components::Cookie *ck, - ACE_Active_Map_Manager_Key &key) - { - Map_Key_Cookie *c = - dynamic_cast <Map_Key_Cookie *> (ck); - - if (c == 0) - return false; - - ::CORBA::OctetSeq *x = c->get_cookie (); - - if (x->length () != ACE_Active_Map_Manager_Key::size ()) - return false; - - key.decode (x->get_buffer ()); - - return true; - } - - ::CORBA::OctetSeq * - Map_Key_Cookie::get_cookie (void) - { - return &this->cookieValue (); - } - - //======================================================== - CORBA::ValueBase * - Map_Key_Cookie_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL) - { - CORBA::ValueBase *ret_val = 0; - - ACE_NEW_THROW_EX (ret_val, - CIAO::Map_Key_Cookie, - CORBA::NO_MEMORY ()); - - // @@ (OO) An "ACE_CHECK_RETURN (0) is missing here. - - return ret_val; - } - - -} diff --git a/TAO/CIAO/DnC/ciao/Cookies.h b/TAO/CIAO/DnC/ciao/Cookies.h deleted file mode 100644 index dd4f11407a8..00000000000 --- a/TAO/CIAO/DnC/ciao/Cookies.h +++ /dev/null @@ -1,75 +0,0 @@ -// $Id$ - -/** - * @file Cookies.h - * - * A CIAO implementation of Cookie valuetype. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - */ - -#ifndef CIAO_COOKIES_H -#define CIAO_COOKIES_H -#include /**/ "ace/pre.h" - -#include "CCM_BaseC.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "CIAO_Container_Export.h" -#include "CIAO_ValueC.h" -#include "ace/Active_Map_Manager.h" - -namespace CIAO -{ - /** - * @class Map_Key_Cookie - * - * @brief A internal cookie valuetype implementation. - */ - class CIAO_CONTAINER_Export Map_Key_Cookie - : public virtual OBV_Components::Cookie - { - public: - Map_Key_Cookie (void); - - virtual ~Map_Key_Cookie (void); - - /// Initialize a @c Cookie with an @c ACE_Active_Map_Manager_Key - Map_Key_Cookie (const ACE_Active_Map_Manager_Key &key); - - /// Insert the @c ACE_Active_Map_Manager_Key - bool insert (ACE_Active_Map_Manager_Key &key); - - /// Operation on the valuetype - CORBA::OctetSeq * get_cookie (void); - - /// Extract the @c ACE_Active_Map_Manager_Key - static bool extract (::Components::Cookie *c, - ACE_Active_Map_Manager_Key &key); - }; - - /** - * @class Map_Key_Cookie_init - * - * @brief Valuefactory implementation for Cookies. - */ - class CIAO_CONTAINER_Export Map_Key_Cookie_init : - public virtual ::Components::Cookie_init - { - public: - virtual ~Map_Key_Cookie_init (void); - - virtual CORBA::ValueBase *create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL); - }; -} - -#if defined (__ACE_INLINE__) -#include "Cookies.inl" -#endif /* !defined INLINE */ - -#include /**/ "ace/post.h" -#endif /* CIAO_COOKIES_H */ diff --git a/TAO/CIAO/DnC/ciao/Cookies.inl b/TAO/CIAO/DnC/ciao/Cookies.inl deleted file mode 100644 index e4d89f595c7..00000000000 --- a/TAO/CIAO/DnC/ciao/Cookies.inl +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -namespace CIAO -{ - ACE_INLINE - Map_Key_Cookie::Map_Key_Cookie (void) - { - } - - // ======================================== - ACE_INLINE - Map_Key_Cookie_init::~Map_Key_Cookie_init () - { - } -} diff --git a/TAO/CIAO/DnC/ciao/CosPersistentState.idl b/TAO/CIAO/DnC/ciao/CosPersistentState.idl deleted file mode 100644 index 64f127539e2..00000000000 --- a/TAO/CIAO/DnC/ciao/CosPersistentState.idl +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - -/** - * @@ This is just a temporary file. Since TAO does not have - * CosPersistentState at all, we use this file to define - * types necessary to get ComponentBase.idl to compile. - * - * Compile with - * tao_idl -Gv CosPersistentState.idl - */ - -#if !defined (CIAO_COSPERSISTENTSTATE_PIDL) -#define CIAO_COSPERSISTENTSTATE_PIDL - -module CosPersistentState { - local interface CatalogBase - { - }; - - typedef sequence<octet> _TypeId; - typedef string Pid; -}; -#endif /* CIAO_COSPERSISTENTSTATE_PIDL */ diff --git a/TAO/CIAO/DnC/ciao/Deployment.idl b/TAO/CIAO/DnC/ciao/Deployment.idl deleted file mode 100644 index a690f64561e..00000000000 --- a/TAO/CIAO/DnC/ciao/Deployment.idl +++ /dev/null @@ -1,535 +0,0 @@ -// $Id$ -#include <orb.idl> -#include "tao/ULongSeq.pidl" -#include "Deployment_Core.idl" - -module Deployment { - - enum SatisfierPropertyKind { - Quantity, - Capacity, - Minimum, - Maximum, - _Attribute, - Selection - }; - - struct SatisfierProperty { - string name; - SatisfierPropertyKind kind; - any value; - }; - - typedef sequence < SatisfierProperty > SatisfierProperties; - - struct SharedResource { - string name; - ::CORBA::StringSeq resourceType; - ::CORBA::ULongSeq nodeRef; - SatisfierProperties property; - }; - - typedef sequence < SharedResource > SharedResources; - - struct Resource { - string name; - ::CORBA::StringSeq resourceType; - SatisfierProperties property; - }; - - typedef sequence < Resource > Resources; - - struct Node { - string name; - string label; - ::CORBA::ULongSeq sharedResourceRef; - ::CORBA::ULongSeq connectionRef; - Resources resource; - }; - - typedef sequence < Node > Nodes; - - struct Interconnect { - string name; - string label; - ::CORBA::ULongSeq connectionRef; - ::CORBA::ULongSeq connectRef; - Resources resource; - }; - - typedef sequence < Interconnect > Interconnects; - - struct Bridge { - string name; - string label; - ::CORBA::ULongSeq connectRef; - Resources resource; - }; - - typedef sequence < Bridge > Bridges; - - struct Domain { - string UUID; - string label; - SharedResources sharedResource; - Nodes node; - Interconnects interconnect; - Bridges bridge; - Properties infoProperty; - }; - - struct ComponentPortDescription { - string name; - string specificType; - ::CORBA::StringSeq supportedType; - boolean provider; - boolean exclusiveProvider; - boolean exclusiveUser; - boolean optional; - CCMComponentPortKind kind; - }; - - typedef sequence < ComponentPortDescription > ComponentPortDescriptions; - - struct ComponentPropertyDescription { - string name; - CORBA::TypeCode type; - }; - - typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions; - - struct ComponentInterfaceDescription { - string label; - string UUID; - string specificType; - ::CORBA::StringSeq supportedType; - ::CORBA::StringSeq idlFile; - Properties configProperty; - ComponentPortDescriptions port; - ComponentPropertyDescriptions property; - Properties infoProperty; - }; - - struct Requirement { - string resourceType; - string name; - Properties property; - }; - - typedef sequence < Requirement > Requirements; - - struct MonolithicDeploymentDescription { - string name; - ::CORBA::StringSeq source; - ::CORBA::ULongSeq artifactRef; - Properties execParameter; - Requirements deployRequirement; - }; - - typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions; - - enum ResourceUsageKind { - None, - InstanceUsesResource, - ResourceUsesInstance, - PortUsesResource, - ResourceUsesPort - }; - - struct InstanceResourceDeploymentDescription { - ResourceUsageKind resourceUsage; - string requirementName; - string resourceName; - any resourceValue; - }; - - typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions; - - struct InstanceDeploymentDescription { - string name; - string node; - ::CORBA::StringSeq source; - unsigned long implementationRef; - Properties configProperty; - InstanceResourceDeploymentDescriptions deployedResource; - InstanceResourceDeploymentDescriptions deployedSharedResource; - }; - - typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions; - - struct ComponentExternalPortEndpoint { - string portName; - }; - - typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints; - - struct PlanSubcomponentPortEndpoint { - string portName; - boolean provider; - CCMComponentPortKind kind; - unsigned long instanceRef; - }; - - typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints; - - struct ExternalReferenceEndpoint { - string location; - }; - - typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints; - - struct ConnectionResourceDeploymentDescription { - string targetName; - string requirementName; - string resourceName; - any resourceValue; - }; - - typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions; - - struct PlanConnectionDescription { - string name; - ::CORBA::StringSeq source; - Requirements deployRequirement; - ComponentExternalPortEndpoints externalEndpoint; - PlanSubcomponentPortEndpoints internalEndpoint; - ExternalReferenceEndpoints externalReference; - ConnectionResourceDeploymentDescriptions deployedResource; - }; - - typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions; - - struct PlanSubcomponentPropertyReference { - string propertyName; - unsigned long instanceRef; - }; - - typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences; - - struct PlanPropertyMapping { - string name; - ::CORBA::StringSeq source; - string externalName; - PlanSubcomponentPropertyReferences delegatesTo; - }; - - typedef sequence < PlanPropertyMapping > PlanPropertyMappings; - - struct ImplementationDependency { - string requiredType; - }; - - typedef sequence < ImplementationDependency > ImplementationDependencies; - - struct ResourceDeploymentDescription { - string requirementName; - string resourceName; - any resourceValue; - }; - - typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions; - - struct ArtifactDeploymentDescription { - string name; - ::CORBA::StringSeq location; - string node; - ::CORBA::StringSeq source; - Properties execParameter; - Requirements deployRequirement; - ResourceDeploymentDescriptions deployedResource; - }; - - typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions; - - struct DeploymentPlan { - string label; - string UUID; - ComponentInterfaceDescription realizes; - MonolithicDeploymentDescriptions implementation; - InstanceDeploymentDescriptions instance; - PlanConnectionDescriptions connection; - PlanPropertyMappings externalProperty; - ImplementationDependencies dependsOn; - ArtifactDeploymentDescriptions artifact; - Properties infoProperty; - }; - - exception ResourceNotAvailable { - string name; - string resourceType; - string propertyName; - string elementName; - string resourceName; - }; - - exception PlanError { - string name; - string reason; - }; - - enum DomainUpdateKind { - Add, - Delete, - UpdateAll, - UpdateAvailable - }; - - interface TargetManager { - Domain getAllResources (); - Domain getAvailableResources (); - void commitResources (in DeploymentPlan plan) - raises (ResourceNotAvailable, PlanError); - void releaseResources (in DeploymentPlan argname); - void updateDomain (in ::CORBA::StringSeq elements, in Domain domainSubset, in DomainUpdateKind updateKind); - }; - - exception InvalidProperty { - string name; - string reason; - }; - - exception StopError { - string name; - string reason; - }; - - interface ApplicationManager { - Application startLaunch (in Properties configProperty, out Connections providedReference, in boolean start) - raises (ResourceNotAvailable, StartError, InvalidProperty); - void destroyApplication (in Application app) - raises (StopError); - }; - - typedef sequence < Application > Applications; - - interface DomainApplicationManager - { - DeploymentPlan getPlan (); - void startLaunch (in Properties configProperty, in boolean start) - raises (ResourceNotAvailable, StartError, InvalidProperty); - void finishLaunch (in boolean start) - raises (StartError, InvalidConnection); - void start () - raises (StartError); - void destroyApplication () - raises (StopError); - }; - - typedef sequence < DomainApplicationManager > DomainApplicationManagers; - - interface ExecutionManager { - DomainApplicationManager preparePlan (in DeploymentPlan plan, in boolean commitResources) - raises (ResourceNotAvailable, PlanError, StartError); - DomainApplicationManagers getManagers (); - void destroyManager (in DomainApplicationManager manager) - raises (StopError); - }; - - interface Logger { - }; - - interface NodeApplicationManager : - ApplicationManager - { - }; - - interface NodeManager { - void joinDomain (in Domain domain, in TargetManager manager, in Logger log); - void leaveDomain (); - NodeApplicationManager preparePlan (in DeploymentPlan plan) - raises (StartError, PlanError); - void destroyManager (in NodeApplicationManager appManager) - raises (StopError); - }; - - exception NameExists { - }; - - exception PackageError { - string source; - string reason; - }; - - exception NoSuchName { - }; - - exception LastConfiguration { - }; - - exception InvalidReference { - }; - - struct PackageConfiguration; - - typedef sequence < PackageConfiguration > PackageConfigurations; - - struct ComponentPackageDescription; - - typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions; - - struct ComponentPackageReference { - string requiredUUID; - string requiredName; - string requiredType; - }; - - typedef sequence < ComponentPackageReference > ComponentPackageReferences; - - struct SubcomponentInstantiationDescription { - string name; - ComponentPackageDescriptions package; - Properties configProperty; - Requirements selectRequirement; - ComponentPackageReferences reference; - }; - - typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions; - - struct SubcomponentPortEndpoint { - string portName; - unsigned long instanceRef; - }; - - typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints; - - struct AssemblyConnectionDescription { - string name; - Requirements deployRequirement; - ComponentExternalPortEndpoints externalEndpoint; - SubcomponentPortEndpoints internalEndpoint; - ExternalReferenceEndpoints externalReference; - }; - - typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions; - - struct SubcomponentPropertyReference { - string propertyName; - unsigned long instanceRef; - }; - - typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences; - - struct AssemblyPropertyMapping { - string name; - string externalName; - SubcomponentPropertyReferences delegatesTo; - }; - - typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings; - - struct ComponentAssemblyDescription { - SubcomponentInstantiationDescriptions instance; - AssemblyConnectionDescriptions connection; - AssemblyPropertyMappings externalProperty; - }; - - typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions; - - struct NamedImplementationArtifact; - - typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts; - - struct ImplementationArtifactDescription { - string label; - string UUID; - ::CORBA::StringSeq location; - Properties execParameter; - Requirements deployRequirement; - NamedImplementationArtifacts dependsOn; - Properties infoProperty; - }; - - struct NamedImplementationArtifact { - string name; - ImplementationArtifactDescription referencedArtifact; - }; - - typedef sequence < ResourceUsageKind > ResourceUsageKinds; - - struct ImplementationRequirement { - ResourceUsageKinds resourceUsage; - string resourcePort; - string componentPort; - string resourceType; - string name; - Properties property; - }; - - typedef sequence < ImplementationRequirement > ImplementationRequirements; - - struct MonolithicImplementationDescription { - Properties execParameter; - NamedImplementationArtifacts primaryArtifact; - ImplementationRequirements deployRequirement; - }; - - typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions; - - struct Capability { - string name; - ::CORBA::StringSeq resourceType; - SatisfierProperties property; - }; - - typedef sequence < Capability > Capabilities; - - struct ComponentImplementationDescription { - string label; - string UUID; - ComponentInterfaceDescription implements; - ComponentAssemblyDescriptions assemblyImpl; - MonolithicImplementationDescriptions monolithicImpl; - Properties configProperty; - Capabilities capability; - ImplementationDependencies dependsOn; - Properties infoProperty; - }; - - struct PackagedComponentImplementation { - string name; - ComponentImplementationDescription referencedImplementation; - }; - - typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations; - - struct ComponentPackageDescription { - string label; - string UUID; - ComponentInterfaceDescription realizes; - Properties configProperty; - PackagedComponentImplementations implementation; - Properties infoProperty; - }; - - struct PackageConfiguration { - string label; - string UUID; - PackageConfigurations specializedConfig; - ComponentPackageDescriptions basePackage; - ComponentPackageReferences reference; - Requirements selectRequirement; - Properties configProperty; - }; - - interface RepositoryManager { - void installPackage (in string installationName, in string location) - raises (NameExists, PackageError); - void createPackage (in string installationName, in PackageConfiguration package, in string baseLocation, in boolean replace) - raises (NameExists, PackageError); - PackageConfiguration findPackageByName (in string name) - raises (NoSuchName); - PackageConfiguration findPackageByUUID (in string UUID) - raises (NoSuchName); - ::CORBA::StringSeq findNamesByType (in string type); - ::CORBA::StringSeq getAllNames (); - ::CORBA::StringSeq getAllTypes (); - void deletePackage (in string installationName) - raises (NoSuchName); - }; - - struct RequirementSatisfier { - string name; - ::CORBA::StringSeq resourceType; - SatisfierProperties property; - }; -}; diff --git a/TAO/CIAO/DnC/ciao/Deployment_Core.idl b/TAO/CIAO/DnC/ciao/Deployment_Core.idl deleted file mode 100644 index 6dac65c2fda..00000000000 --- a/TAO/CIAO/DnC/ciao/Deployment_Core.idl +++ /dev/null @@ -1,183 +0,0 @@ -// $Id$ - -#if !defined (DEPLOYMENT_CORE_IDL) -#define DEPLOYMENT_CORE_IDL - -#include "CCM_Component.idl" - -// *************** Packaging and Deployment *************** -module Deployment -{ - // Typeprefix Components "omg.org"; - // OMG threw these things away, didn't it. - - exception UnknownImplId {}; - exception InvalidLocation {}; - exception InstallationFailure {/*Do we still need a reason? --Tao*/}; - exception ImplEntryPointNotFound {}; - - //Below are from the OMG Deployment.idl - - exception StartError { - string name; - string reason; - }; - - exception InvalidConnection { - string name; - string reason; - }; - //==============property================== - struct Property { - string name; - any value; - }; - typedef sequence < Property > Properties; - - //============connection================== - - typedef sequence < Object > Endpoints; - //typedef Object Endpoint; - - enum CCMComponentPortKind { - Facet, - SimplexReceptacle, - MultiplexReceptacle, - EventEmitter, - EventPublisher, - EventConsumer - }; - - // To avoid the connection info in the plan being passed to the - // local node and to make the implementation not very cumbersome - // I changed the connection struct to include some extra informations. - struct Connection { - string instanceName; - string portName; - CCMComponentPortKind kind; - - // the endpoints member is change to endpoint. - // Since we will not have more than 1 objref in there. - Object endpoint; - }; - typedef sequence < Connection > Connections; - - //======================================= - struct ImplementationInfo - { - string component_instance_name; - string executor_dll; - string executor_entrypt; - string servant_dll; - string servant_entrypt; - Properties component_config; - // Properties home_config; //ignored for now. - // Properties container_config //igore for now - }; - - typedef sequence < ImplementationInfo > ImplementationInfos; - - //================================== - interface Application - { - void finishLaunch (in Connections providedReference, in boolean start) - raises (StartError, InvalidConnection); - void start () - raises (StartError); - }; - - struct Component_Info - { - string component_instance_name; - Components::CCMObject component_ref; - }; - - typedef sequence < Component_Info > ComponentInfos; - - // @@ (OO) Tao, you're altering an OMG defined interface below. In - // order to avoid confusion, it is probably better to create - // another NodeApplication interface in the CIAO namespace - // that inherits from Deployment::NodeApplication. You'd - // then use the CIAO::NodeApplication in your - // implementation. - // - // Alternatively, you should at least place a CIAO-specific - // typeprefix within your altered NodeApplication interface - // to prevent interoperability issues. - - // This NodeApplication contains the semantic from both Container and - // the new DnC NodeApplication --Tao - interface NodeApplication : Application - { - readonly attribute ::Deployment::Properties properties; - - /*@@ This operation is added for the NodeApplicationManager to - * initialize the NodeApplication after creating it. The - * properties are those for the Container and they will be - * implemented upon request from our users. --Tao - * - * Seems Kitty is opposing the idea of sending anys around. But - * what really stroke me down was that OMG is working out - * another property&configuration specification so all the - * properties we set/used might have to be thrown away in the - * future.....I am totally speachless and confused...and - * frustrated. - * - * But any way seems I can forget about the configuration - * now. --Tao - */ - - // @@ Initialize the nodeapplication, so it will know what - // components it will create and home many of them are - // there. However the real create action will take place when - // start launch is called on NodeApplicationManager. - long init (); - - // @@ This operation will be called by NodeApplicationManager - // client to really start to create homes and components. - ComponentInfos install (in ImplementationInfos impl_infos) - raises (UnknownImplId, - ImplEntryPointNotFound, - InstallationFailure, - ::Components::InvalidConfiguration); - - - //@@ We know that Dployment::NodeApplicationManager will be returned, - // however to avoid the size of the shared object of CIAO_Server. - // we return an Object. - Object get_node_application_manager (); - - //@@ The properties will contain - //1 component instance name as the key. - //2 dll/so name of the exec - //3 entry point of the exec - //4 dll/so name of the svnt - //5 entry point of the svnt - //6 Poosible other configuration for container/home/component - //Note:: We have to decide later how container/home/component could be configured. - // These properties could be passed in here or at higher level - // according to the plan(@ NodeApplicationManager/NodeApplication?) - // - //The reason that I want to expose these operation in IDL (can be called remotely) - //is 1. for easy testing. - // 2. Might comes in handy in the future. - // --Tao - ::Components::CCMHome install_home (in ImplementationInfo impl_info) - raises (UnknownImplId, - ImplEntryPointNotFound, - InstallationFailure, - ::Components::InvalidConfiguration); - - void remove_home (in string comp_ins_name) - raises (::Components::RemoveFailure); - - ::Components::CCMHomes get_homes (); - - void remove () - raises (::Components::RemoveFailure); - - - }; - -}; -#endif /* DEPLOYMENT_CORE_IDL */ diff --git a/TAO/CIAO/DnC/ciao/Deployment_stub_export.h b/TAO/CIAO/DnC/ciao/Deployment_stub_export.h deleted file mode 100644 index 12985a68b5b..00000000000 --- a/TAO/CIAO/DnC/ciao/Deployment_stub_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s Deployment_stub -// ------------------------------ -#ifndef DEPLOYMENT_STUB_EXPORT_H -#define DEPLOYMENT_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DEPLOYMENT_STUB_HAS_DLL) -# define DEPLOYMENT_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DEPLOYMENT_STUB_HAS_DLL */ - -#if !defined (DEPLOYMENT_STUB_HAS_DLL) -# define DEPLOYMENT_STUB_HAS_DLL 1 -#endif /* ! DEPLOYMENT_STUB_HAS_DLL */ - -#if defined (DEPLOYMENT_STUB_HAS_DLL) && (DEPLOYMENT_STUB_HAS_DLL == 1) -# if defined (DEPLOYMENT_STUB_BUILD_DLL) -# define Deployment_stub_Export ACE_Proper_Export_Flag -# define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DEPLOYMENT_STUB_BUILD_DLL */ -# define Deployment_stub_Export ACE_Proper_Import_Flag -# define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DEPLOYMENT_STUB_BUILD_DLL */ -#else /* DEPLOYMENT_STUB_HAS_DLL == 1 */ -# define Deployment_stub_Export -# define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T) -# define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DEPLOYMENT_STUB_HAS_DLL == 1 */ - -// Set DEPLOYMENT_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DEPLOYMENT_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define DEPLOYMENT_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DEPLOYMENT_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DEPLOYMENT_STUB_NTRACE */ - -#if (DEPLOYMENT_STUB_NTRACE == 1) -# define DEPLOYMENT_STUB_TRACE(X) -#else /* (DEPLOYMENT_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DEPLOYMENT_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DEPLOYMENT_STUB_NTRACE == 1) */ - -#endif /* DEPLOYMENT_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/ciao/Deployment_svnt_export.h b/TAO/CIAO/DnC/ciao/Deployment_svnt_export.h deleted file mode 100644 index e403dbf0c41..00000000000 --- a/TAO/CIAO/DnC/ciao/Deployment_svnt_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s Deployment_svnt -// ------------------------------ -#ifndef DEPLOYMENT_SVNT_EXPORT_H -#define DEPLOYMENT_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DEPLOYMENT_SVNT_HAS_DLL) -# define DEPLOYMENT_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DEPLOYMENT_SVNT_HAS_DLL */ - -#if !defined (DEPLOYMENT_SVNT_HAS_DLL) -# define DEPLOYMENT_SVNT_HAS_DLL 1 -#endif /* ! DEPLOYMENT_SVNT_HAS_DLL */ - -#if defined (DEPLOYMENT_SVNT_HAS_DLL) && (DEPLOYMENT_SVNT_HAS_DLL == 1) -# if defined (DEPLOYMENT_SVNT_BUILD_DLL) -# define Deployment_svnt_Export ACE_Proper_Export_Flag -# define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DEPLOYMENT_SVNT_BUILD_DLL */ -# define Deployment_svnt_Export ACE_Proper_Import_Flag -# define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DEPLOYMENT_SVNT_BUILD_DLL */ -#else /* DEPLOYMENT_SVNT_HAS_DLL == 1 */ -# define Deployment_svnt_Export -# define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T) -# define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DEPLOYMENT_SVNT_HAS_DLL == 1 */ - -// Set DEPLOYMENT_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DEPLOYMENT_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define DEPLOYMENT_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DEPLOYMENT_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DEPLOYMENT_SVNT_NTRACE */ - -#if (DEPLOYMENT_SVNT_NTRACE == 1) -# define DEPLOYMENT_SVNT_TRACE(X) -#else /* (DEPLOYMENT_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DEPLOYMENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DEPLOYMENT_SVNT_NTRACE == 1) */ - -#endif /* DEPLOYMENT_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/ciao/NodeApp_CB_Impl.cpp b/TAO/CIAO/DnC/ciao/NodeApp_CB_Impl.cpp deleted file mode 100644 index 436f4bbadcf..00000000000 --- a/TAO/CIAO/DnC/ciao/NodeApp_CB_Impl.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// $Id$ -#include "NodeApp_CB_Impl.h" - -CIAO::NodeApplication_Callback_Impl:: -NodeApplication_Callback_Impl (CORBA::ORB_ptr o, - PortableServer::POA_ptr p, - Deployment::NodeApplicationManager_ptr s, - const Deployment::Properties &properties - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) - : orb_ (CORBA::ORB::_duplicate (o)), - poa_ (PortableServer::POA::_duplicate (p)), - nam_ (Deployment::NodeApplicationManager::_duplicate (s)) -{ - ACE_TRY - { - //@@ Note: this properties is useless unless - // we have some specific properties for the callback obj. - Deployment::Properties * tmp = 0; - ACE_NEW_THROW_EX (tmp, - Deployment::Properties (properties), - CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; - this->properties_ = tmp; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApp_CB_Impl::Constructor\t\n"); - ACE_RE_THROW; - } - ACE_ENDTRY; - ACE_CHECK; -} - -CIAO::NodeApplication_Callback_Impl::~NodeApplication_Callback_Impl () -{ -} - -PortableServer::POA_ptr -CIAO::NodeApplication_Callback_Impl::_default_POA (void) -{ - return PortableServer::POA::_duplicate (this->poa_.in ()); -} - -Deployment::NodeApplicationManager_ptr -CIAO::NodeApplication_Callback_Impl::register_node_application ( - Deployment::NodeApplication_ptr na, - Deployment::Properties_out properties - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - properties = this->properties_._retn (); - - this->nodeapp_ = Deployment::NodeApplication::_duplicate (na); - return Deployment::NodeApplicationManager::_duplicate (this->nam_.in ()); -} - -Deployment::NodeApplication_ptr -CIAO::NodeApplication_Callback_Impl::get_nodeapp_ref (void) -{ - // @@ (OO) How are you relinquishing ownership here? Since you're - // duplicating the reference you actually maintain - // ownership. Is the below comment wrong, or is the code - // wrong? - - // Relinquish the ownership of the nodeapplication reference. - //This method should only be called from the NodeApplicationManager. - return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ()); -} diff --git a/TAO/CIAO/DnC/ciao/NodeApp_CB_Impl.h b/TAO/CIAO/DnC/ciao/NodeApp_CB_Impl.h deleted file mode 100644 index 24762483cc2..00000000000 --- a/TAO/CIAO/DnC/ciao/NodeApp_CB_Impl.h +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- -// $Id$ -//============================================================================= -/** - * @file NodeApp_CB_Impl.h - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - * Tao Lu <lu@dre.vanderbilt.edu> - * - //===========================================================================*/ - - -#ifndef NODEAPPLICATION_CALLBACK_IMPL_H -#define NODEAPPLICATION_CALLBACK_IMPL_H -#include /**/ "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "NodeApplication_CallBackS.h" - -namespace CIAO -{ - // Forward declaration. - // class NodeApplicationManager; - - /** - * @class NodeApplication_Callback_Impl - * - * @brief A call back interface for NodeApplication - * @Note Here is no need to be thread safe since for every nodeapplication - * we will have an unique callback object. --Tao - */ - class Deployment_svnt_Export NodeApplication_Callback_Impl - : public virtual POA_CIAO::NodeApplication_Callback, - public virtual PortableServer::RefCountServantBase - { - public: - friend class NodeApplicationManager_Impl; - - /// Constructor. - NodeApplication_Callback_Impl (CORBA::ORB_ptr o, - PortableServer::POA_ptr p, - Deployment::NodeApplicationManager_ptr s, - const Deployment::Properties &properties - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // @@ (OO) Since this class is reference counted, please make this - // destructor protected to enforce proper memory managment - // through the reference counting mechanism (i.e. to - // disallow calling operator delete() on an instance of - // this class. - /// Destructor. - ~NodeApplication_Callback_Impl (); - - /// Get the containing POA. This operation does *not* increase - /// the reference count of the POA. - virtual PortableServer::POA_ptr _default_POA (void); - - /// Record the NodeApplication reference returned by the newly - /// spawned NodeApplication and give it back a reference to - /// NodeApplicationManager - Deployment::NodeApplicationManager_ptr - register_node_application (Deployment::NodeApplication_ptr na, - Deployment::Properties_out properties - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - protected: - Deployment::NodeApplication_ptr get_nodeapp_ref (void); - - CORBA::ORB_var orb_; - - PortableServer::POA_var poa_; - - Deployment::NodeApplicationManager_var nam_; - - Deployment::NodeApplication_var nodeapp_; - - Deployment::Properties_var properties_; - }; -} - -#include /**/ "ace/post.h" -#endif /* NODEAPPLICATION_CALLBACK_IMPL_H */ diff --git a/TAO/CIAO/DnC/ciao/NodeApplication_CallBack.idl b/TAO/CIAO/DnC/ciao/NodeApplication_CallBack.idl deleted file mode 100644 index 9c4f1d14775..00000000000 --- a/TAO/CIAO/DnC/ciao/NodeApplication_CallBack.idl +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -/** - * This IDL file is used to combine the NodeApplication - * interface with the NodeApplicationManager interface. - * - * NodeApplicationManager will be spwan NodeApplication. - * The call back object will be used to get the objectref of - * NodeApplication. - */ - -#include "Deployment.idl" - -module CIAO -{ - interface NodeApplication_Callback - { - Deployment::NodeApplicationManager - register_node_application (in Deployment::NodeApplication na, - out Deployment::Properties properties); - }; -}; diff --git a/TAO/CIAO/DnC/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DnC/ciao/NodeApplication_Impl.cpp deleted file mode 100644 index df60f15873d..00000000000 --- a/TAO/CIAO/DnC/ciao/NodeApplication_Impl.cpp +++ /dev/null @@ -1,548 +0,0 @@ -//$Id$ - -#include "NodeApplication_Impl.h" - -#if !defined (__ACE_INLINE__) -# include "NodeApplication_Impl.inl" -#endif /* __ACE_INLINE__ */ - -CIAO::NodeApplication_Impl::~NodeApplication_Impl () -{ - delete this->container_; -} - -void -CIAO::NodeApplication_Impl:: -finishLaunch (const Deployment::Connections & providedReference, - CORBA::Boolean start - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError, - Deployment::InvalidConnection)) -{ - const CORBA::ULong length = providedReference.length (); - - ACE_TRY - { - // For every connection struct we finish the connection. - for (CORBA::ULong i = 0; i < length; ++i) - { - ACE_CString name = providedReference[i].instanceName.in (); - Components::CCMObject_ptr comp; - - if (this->component_map_.find (name, comp) != 0) - { - ACE_THROW (Deployment::InvalidConnection ()); - } - - Components::EventConsumerBase_var consumer; - //Since we know CCMObject inherits from navigation/event/receptacle, no need - //to narrow here. - switch (providedReference[i].kind) - { - case Deployment::SimplexReceptacle: - comp->connect (providedReference[i].portName.in (), - providedReference[i].endpoint.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - break; - - case Deployment::MultiplexReceptacle: - comp->connect(providedReference[i].portName.in (), - providedReference[i].endpoint.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - break; - - case Deployment::EventEmitter: - consumer = Components::EventConsumerBase:: - _narrow (providedReference[i].endpoint.in () - ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - if (CORBA::is_nil (consumer.in ())) - { - ACE_THROW (Deployment::InvalidConnection ()); - } - - comp->connect_consumer(providedReference[i].portName.in (), - consumer.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - break; - - case Deployment::EventPublisher: - consumer = Components::EventConsumerBase:: - _narrow (providedReference[i].endpoint.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - if (CORBA::is_nil (consumer.in ())) - ACE_THROW (Deployment::InvalidConnection ()); - - comp->subscribe (providedReference[i].portName.in (), - consumer.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - break; - - default: - ACE_THROW (Deployment::InvalidConnection ()); - } - } - if (start) - { - this->start (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApplication_Impl::finishLaunch\t\n"); - ACE_RE_THROW; - } - - ACE_ENDTRY; -} - -void -CIAO::NodeApplication_Impl:: -start (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError)) -{ - //@@ Note: set_session_context will be called when the servant is created. - Funct_Ptr functor = & Components::CCMObject::ciao_preactivate; - start_i (functor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - functor = & Components::CCMObject::ciao_activate; - start_i (functor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - functor = & Components::CCMObject::ciao_postactivate; - start_i (functor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -void -CIAO::NodeApplication_Impl:: -start_i (Funct_Ptr functor - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError)) -{ - const Component_Iterator end (this->component_map_.end ()); - for (Component_Iterator iter (this->component_map_.begin ()); - iter != end; - ++iter) - { - //@@ I don't know what if Components::InvalidConfiguration - // is thrown from here, so it's ignored for now. --Tao - (((*iter).int_id_)->*functor) (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } -} - -::Deployment::Properties * -CIAO::NodeApplication_Impl:: -properties (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - Deployment::Properties * tmp; - - ACE_NEW_THROW_EX (tmp, - Deployment::Properties (this->properties_), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - - return tmp; -} - -::Deployment::ComponentInfos * -CIAO::NodeApplication_Impl:: -install (const ::Deployment::ImplementationInfos & impl_infos - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InstallationFailure, - Components::InvalidConfiguration)) -{ - Deployment::ComponentInfos_var retv; - ACE_TRY - { - Deployment::ComponentInfos * tmp; - ACE_NEW_THROW_EX (tmp, - Deployment::ComponentInfos, - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - retv = tmp; - - const CORBA::ULong len = impl_infos.length (); - - retv->length (len); - - // @@ (OO) There is no need to declare these variables outside of - // the loop. Some folks doing so is an optimization but - // doing so generally defeats some compiler optimizations. - // Please move these declaration within the loop. - Components::CCMHome_var home; - Components::CCMObject_var comp; - - for (CORBA::ULong i = 0; i < len; ++i) - { - home = this->install_home (impl_infos[i] - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Components::KeylessCCMHome_var kh = - Components::KeylessCCMHome::_narrow (home.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (kh.in ())) - ACE_THROW_RETURN (Deployment::InstallationFailure (), 0); - - // @@ Note, here we are missing the CreateFailure. - // Sometime I will come back to add exception rethrow. - comp = kh->create_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (this->component_map_.bind (impl_infos[i].component_instance_name.in (), - Components::CCMObject::_duplicate (comp.in ()))) - ACE_THROW_RETURN (Deployment::InstallationFailure (), 0); - - // Set the return value. - (*retv)[i].component_instance_name - = impl_infos[i].component_instance_name.in (); - - (*retv)[i].component_ref = Components::CCMObject::_duplicate (comp.in ()); - - // Deal with Component instance related Properties. - // Now I am only concerning about the COMPOENTIOR and here is only - // the hardcoded version of the configuration. Hopefully we will - // reach an agreement after the RTWS about how the configuration - // should be done. - - const CORBA::ULong clen = impl_infos[i].component_config.length (); - for (CORBA::ULong prop_len = 0; prop_len < clen; ++prop_len) - { - if (ACE_OS::strcmp (impl_infos[i].component_config[prop_len].name.in (), - "ComponentIOR") == 0) - { - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_DEBUG, "Found property to write the IOR.\n")); - const char * path; - impl_infos[i].component_config[prop_len].value >>= path; - - CORBA::String_var ior = - this->orb_->object_to_string (comp.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (write_IOR (path, ior.in ()) != 0) - { - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_DEBUG, "Failed to write the IOR.\n")); - ACE_THROW (CORBA::INTERNAL ()); - } - - } - } - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO_NodeApplication::install error\t\n"); - ACE_RE_THROW; - return 0; - } - ACE_ENDTRY; - return retv._retn (); -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -::Components::CCMHome_ptr -CIAO::NodeApplication_Impl:: -install_home (const ::Deployment::ImplementationInfo & impl_info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InstallationFailure, - Components::InvalidConfiguration)) -{ - Components::CCMHome_var newhome = - this->container_->ciao_install_home - (impl_info.executor_dll.in (), - impl_info.executor_entrypt.in (), - impl_info.servant_dll.in (), - impl_info.servant_entrypt.in () - ACE_ENV_ARG_PARAMETER); - - ACE_CHECK_RETURN (Components::CCMHome::_nil ()); - // We don't have to do _narrow since the generated code makes sure of - // the object type for us - - // Bind the home in the map. - if (this->home_map_.bind (impl_info.component_instance_name.in (), - Components::CCMHome::_duplicate (newhome.in ()))) - ACE_THROW_RETURN (Deployment::InstallationFailure (), - Components::CCMHome::_nil ()); - - //Note: If the return value will be discarded, it must be kept in a var or - // release () will have to be called explicitly. - return newhome._retn (); -} - -// @@ (OO) Method definitions should never use "_WITH_DEFAULTS" -// versions of emulated exception parameters. Please remove -// the "_WITH_DEFAULTS" -void -CIAO::NodeApplication_Impl:: -remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)) -{ - // Remove all components first. - remove_components (); - - ACE_CHECK; - - // Even if above op failed we should still remove homes. - const Home_Iterator end (this->home_map_.end ()); - for (Home_Iterator iter (this->home_map_.begin ()); - iter != end; - ++iter) - { - this->container_->ciao_uninstall_home ( (*iter).int_id_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CORBA::release ( (*iter).int_id_); - } - - this->home_map_.unbind_all (); - - if (CIAO::debug_level () > 1) - ACE_DEBUG ((LM_DEBUG, "Shutting down this NodeApplication!\n")); - - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} - -void -CIAO::NodeApplication_Impl:: -remove_home (const char * comp_ins_name - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)) -{ - Components::CCMHome_ptr home; - ACE_CString str (comp_ins_name); - - if (this->home_map_.find (str, home) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); - - // We should remove all components created by this home as well. - // This is not implemented yet. - - this->container_->ciao_uninstall_home (home - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // If the previous calls failed, what should we do here?? - CORBA::release (home); - - // @@ Still need to remove the home if the previous operation fails? - if (this->home_map_.unbind (str) == -1) - ACE_THROW (::Components::RemoveFailure ()); -} - -Components::CCMHomes * -CIAO::NodeApplication_Impl:: -get_homes (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - Components::CCMHomes * tmp; - ACE_NEW_THROW_EX (tmp, - Components::CCMHomes (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - - Components::CCMHomes_var retval (tmp); - - // @@ (OO) Please declare len as "const". - CORBA::ULong len = this->home_map_.current_size (); - retval->length (len); - - - CORBA::ULong i = 0; - const Home_Iterator end = this->home_map_.end (); - for (Home_Iterator iter (this->home_map_.begin ()); - iter != end; - ++iter, ++i) - { - retval[i] = Components::CCMHome::_duplicate ( (*iter).int_id_); - } - - return retval._retn (); -} - -CORBA::Long -CIAO::NodeApplication_Impl:: -init (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_NEW_THROW_EX (this->container_, - CIAO::Session_Container (this->orb_.in (), - 0, - 0), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (-1); - - return this->container_->init (0, - 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - return 0; -} - -::CORBA::Object_ptr -CIAO::NodeApplication_Impl:: -get_node_application_manager (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return ::CORBA::Object::_duplicate (this->node_app_manager_.in ()); -} - - -PortableServer::POA_ptr -CIAO::NodeApplication_Impl:: -_default_POA (void) -{ - return PortableServer::POA::_duplicate (this->poa_.in ()); -} - -void -CIAO::NodeApplication_Impl:: -remove_components (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)) -{ - //Remove all the components in the NodeApplication/Container - // Release all component servant object. - const Component_Iterator end (this->component_map_.end ()); - for (Component_Iterator iter (this->component_map_.begin ()); - iter != end; - ++iter) - { - Components::CCMHome_ptr home; - if (this->home_map_.find ( (*iter).ext_id_, home) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); - - // This will call ccm_passivate on the component executor. - home->remove_component ((*iter).int_id_); - ACE_CHECK; - - CORBA::release ( (*iter).int_id_); - } - - this->component_map_.unbind_all (); - // To this point the servant should have been destroyed. However, - // if someone is still making calls on the servant, terrible thing - // will happen. -} - -void -CIAO::NodeApplication_Impl:: -remove_component (const char * comp_ins_name - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)) -{ - Components::CCMObject_ptr comp; - Components::CCMHome_ptr home; - - ACE_CString str (comp_ins_name); - - /* Before we do remove component we have to inform the homeservant so - * Component::ccm_passivate () - * constainer::ninstall_component () ->deactivate_object () will be called. - * - * ccm_remove will be called when the poa destroys the servant. - */ - - if (this->component_map_.find (str, comp) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); - - if (this->home_map_.find (str, home) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); - - // This will call ccm_passivate on the component executor. - home->remove_component (comp); - ACE_CHECK; - - // If the previous calls failed, what should we do here?? - CORBA::release (comp); - - // @@ Still need to remove the home if the previous operation fails? - if (this->component_map_.unbind (str) == -1) - ACE_THROW (::Components::RemoveFailure ()); -} - -// The code below is obsolete now. However I want to keep it arround as a -// start point for configurations. -/* -void -CIAO::NodeApplication_Impl:: -parse_config_values (const ::Deployment::Properties & properties, - struct home_installation_info &component_install_info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Components::InvalidConfiguration)) -{ - - for (CORBA::ULong i = 0; i < properties.length(); ++i) - { - // Place holder for string values - const char * str = 0; - const char * name = properties[i].name.in(); - - // I assume the property will be given in the following format! --Tao - if (ACE_OS::strcmp (name, "CIAO-servant-location")) - { - properties[i].value >>= str; - component_install_info.servant_dll_= str; //deep copy happens here. - } - else if (ACE_OS::strcmp (name, "CIAO-servant-entryPoint")) - { - properties[i].value >>= str; - component_install_info.servant_entrypt_= str; //deep copy happens here. - } - else if (ACE_OS::strcmp (name, "CIAO-executor-location")) - { - properties[i].value >>= str; - component_install_info.executor_dll_= str; //deep copy happens here. - } - else if (ACE_OS::strcmp (name, "CIAO-executor-entryPoint")) - { - properties[i].value >>= str; - component_install_info.executor_entrypt_= str; //deep copy happens here. - } - else - { - ACE_DEBUG ((LM_DEBUG, "Found unrecognized property: %s\n",name)); - //I should put the name of the configuration inside of the exception. --Tao - ACE_THROW (Components::InvalidConfiguration ()); - } - } - - // We don't need to worry about the case when some info is missing since - // the modeling tool will ensure the complete info to presented in the properties. -} -*/ diff --git a/TAO/CIAO/DnC/ciao/NodeApplication_Impl.h b/TAO/CIAO/DnC/ciao/NodeApplication_Impl.h deleted file mode 100644 index 64e497f2fdb..00000000000 --- a/TAO/CIAO/DnC/ciao/NodeApplication_Impl.h +++ /dev/null @@ -1,253 +0,0 @@ -//$Id$ -/**======================================================== - * - * @file NodeApplication_Impl.h - * - * @Brief This file contains the implementation of - * the NodeApplication interface. - * - * @auther Tao Lu <lu@dre.vanderbilt.edu> - *========================================================*/ - -#ifndef NODEAPPLICATION_IMPL_H -#define NODEAPPLICATION_IMPL_H -#include /**/ "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/ORB.h" -#include "ace/Synch.h" -#include "ace/Synch_Traits.h" -#include "Container_Base.h" -#include "Deployment_CoreS.h" -#include "Server_init.h" -#include "CIAO_common.h" - -using CIAO::Utility::write_IOR; - -/** - * - * @class NodeApplication_Impl - * - * @brief This class implements the NodeApplication interface. - * This interface is semantically very simillar to container - * in the old DnC spec. However this class will also be used - * as a Server for hosting home/component. This way we reduce the - * complexity of the framework by omitting the componentserver layer. - * - * @@TODO add configuration capabilities. Threading is one of them. - * - * @@Assumptions: - * 1. There is only 1 container for all components/homes associating - * with 1 NodeApplication - * 2. Now the implementation is not thread safe. - **/ - -namespace CIAO -{ - class CIAO_SERVER_Export NodeApplication_Impl - : public virtual POA_Deployment::NodeApplication - { - public: - - // Default constructor. - NodeApplication_Impl (CORBA::ORB_ptr o, - PortableServer::POA_ptr p); - - // Default destructor. - virtual ~NodeApplication_Impl (void); - - - /** - * @method finishLaunch - * - * @brief This operation dose 2 things. - * 1. Get the external connction (facet and Event source) - * and connect them to the local receptacle/event sink. - * 2. If the start augment is true, start the Components. - * @Note: - * The connection containes the object ref of the provided object - * reference (facet/event consumer) of components from other NodeApplications. - * However the name field stores the name of the port on the local component. - * - */ - virtual void - finishLaunch (const Deployment::Connections & providedReference, - CORBA::Boolean start - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError, - Deployment::InvalidConnection)); - - /** - * @method start - */ - virtual void - start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError)); - - /*------------- CIAO specific helper operations (idl)-------- - * - *-----------------------------------------------------------*/ - - // Initialize the NodeApplication - virtual CORBA::Long init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Start install homes and components. - virtual ::Deployment::ComponentInfos * - install (const ::Deployment::ImplementationInfos & impl_infos - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - ::Deployment::UnknownImplId, - ::Deployment::ImplEntryPointNotFound, - ::Deployment::InstallationFailure, - ::Components::InvalidConfiguration)); - - // Access the readonly attribute. - virtual ::Deployment::Properties * - properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual ::Components::CCMHome_ptr - install_home (const ::Deployment::ImplementationInfo & impl_info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InstallationFailure, - Components::InvalidConfiguration)); - - /** - * @@Note: I don't know how to remove a home right now. - * I assume that user will only call remove instead. - * This is true at least for DnC run time. - * - * Right now, in this implementation I assumpe that there will be - * same number of homes as the components even if the components - * are of the same type. I don't think that we have the modeling - * side support of this either. So bear me if you think I avoid - * the real thinking for easiness. - */ - virtual void remove_home (const char * comp_ins_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)); - - // Remove everything inside including all components and homes. - // User must be sure that no connection is active before calling this!! - virtual void remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)); - - // Return all homes. - virtual ::Components::CCMHomes * - get_homes (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /*------------- CIAO specific helper functions (C++)--------- - * - *-----------------------------------------------------------*/ - - // Get the containing POA. This operation does *not* - // increase the reference count of the POA. - virtual PortableServer::POA_ptr _default_POA (void); - - // Get the object reference of the NodeApplicationManager. - // This might comes in handy later. - virtual ::CORBA::Object_ptr - get_node_application_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - protected: - - // @@ (OO) Methods internal to the class, e.g. protected and not - // defined in IDL should not be using default arguments. - // Please drop the "_WITH_DEFAULTS" in all of the below - // protected methods. - - // This is a helper method to clean up components - // should only be called when we are sure that there is no - // active connection on this component. - virtual void remove_components (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)); - - virtual void remove_component (const char * comp_ins_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::RemoveFailure)); - - // This function is a helper for start call. Bala's - // Idea of adding those pre/post activate calls doesn't work - // with the new sepc. - //@@ TODO. Come up with new ways of synchronized initialization process. - typedef void (Components::CCMObject::*Funct_Ptr) - (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - - virtual void start_i (Funct_Ptr functor - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::StartError)); - - // To store all created CCMHome object - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - Components::CCMHome_ptr, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> CCMHome_Map; - typedef CCMHome_Map::iterator Home_Iterator; - CCMHome_Map home_map_; - - // To sotre all created Component object. - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - Components::CCMObject_ptr, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> CCMComponent_Map; - typedef CCMComponent_Map::iterator Component_Iterator; - CCMComponent_Map component_map_; - - // Keep a pointer to the managing ORB serving this servant. - CORBA::ORB_var orb_; - - // Keep a pointer to the managing POA. - PortableServer::POA_var poa_; - - // Internal container implementation. - CIAO::Container *container_; - - // Cached properties - Deployment::Properties properties_; - - // And a reference to the NodeApplicationManager that created us. - ::CORBA::Object_var node_app_manager_; - - // Synchronize access to the object set. - // This will be needed in the case when component/home run in different thread - // TAO_SYNCH_MUTEX lock_; - - //@@ As I have stated in the idl we are not going to use properties for now. - // parse The Properties - /*void parse_config_values (const ::Deployment::Properties & properties, - struct home_installation_info &component_install_info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Components::InvalidConfiguration)); - */ - }; -} - -#if defined (__ACE_INLINE__) -# include "NodeApplication_Impl.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" -#endif /* NODEAPPLICATION_IMPL_H */ diff --git a/TAO/CIAO/DnC/ciao/NodeApplication_Impl.inl b/TAO/CIAO/DnC/ciao/NodeApplication_Impl.inl deleted file mode 100644 index dd541db9b70..00000000000 --- a/TAO/CIAO/DnC/ciao/NodeApplication_Impl.inl +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -CIAO::NodeApplication_Impl:: -NodeApplication_Impl (CORBA::ORB_ptr o, - PortableServer::POA_ptr p) - - : orb_ (CORBA::ORB::_duplicate (o)), - poa_ (PortableServer::POA::_duplicate (p)), - container_ (0) - - // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet - // large. The maximum size of an ACE_Hash_Map_Manager is - // also fixed, i.e. it does not grow dynamically on demand. - // Make sure the default size of home_map_ and - // component_map_ is appropriate for your needs. You may - // also want to make the size configurable at compile-time, - // at least. -{ -} diff --git a/TAO/CIAO/DnC/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DnC/ciao/Servant_Impl_Base.cpp deleted file mode 100644 index 16bfc99c407..00000000000 --- a/TAO/CIAO/DnC/ciao/Servant_Impl_Base.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// $Id$ - -#include "Servant_Impl_Base.h" - -namespace CIAO -{ - Servant_Impl_Base::Servant_Impl_Base (Session_Container * c) - : container_ (c) - { - } - - Servant_Impl_Base::~Servant_Impl_Base (void) - { - } - - void - Servant_Impl_Base::add_facet (const char *port_name, - CORBA::Object_ptr port_ref) - { - ::Components::FacetDescription *fd = 0; - ACE_NEW (fd, - OBV_Components::FacetDescription); - ::Components::FacetDescription_var safe = fd; - - fd->name (port_name); - fd->type_id (port_ref->_interface_repository_id ()); - fd->facet_ref (port_ref); - - if (this->facet_table_.bind (port_name, fd) == 0) - { - safe._retn (); - } - } - - void - Servant_Impl_Base::add_consumer ( - const char *port_name, - ::Components::EventConsumerBase_ptr port_ref - ) - { - ::Components::ConsumerDescription *cd = 0; - ACE_NEW (cd, - OBV_Components::ConsumerDescription); - ::Components::ConsumerDescription_var safe = cd; - - cd->name (port_name); - cd->type_id (port_ref->_interface_repository_id ()); - cd->consumer (port_ref); - - if (this->consumer_table_.bind (port_name, cd) == 0) - { - safe._retn (); - } - } -} diff --git a/TAO/CIAO/DnC/ciao/Servant_Impl_Base.h b/TAO/CIAO/DnC/ciao/Servant_Impl_Base.h deleted file mode 100644 index ea854dbde26..00000000000 --- a/TAO/CIAO/DnC/ciao/Servant_Impl_Base.h +++ /dev/null @@ -1,80 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Servant_Impl_Base.h - * - * $Id$ - * - * This file contains the non-template declaration of a base class for - * the template mixin for the generated servant class. - * - * @author Jeff Parsons <j.parsons@vanderbilt.edu> - */ -//============================================================================= - - -#ifndef CIAO_SERVANT_IMPL_BASE_H -#define CIAO_SERVANT_IMPL_BASE_H - -#include /**/ "ace/pre.h" - -#include "ace/Hash_Map_Manager_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "CCM_EventC.h" -#include "CIAO_Server_Export.h" - -namespace CIAO -{ - class Session_Container; - - /** - * @class Servant_Impl_Base - * - * @brief Non-template base class for Servant_Impl. - * - * Holds the non-template parts of its child class - * Servant_Impl. - */ - class CIAO_SERVER_Export Servant_Impl_Base - { - public: - Servant_Impl_Base (Session_Container * c); - - virtual ~Servant_Impl_Base (void); - - protected: - void add_facet (const char *port_name, - CORBA::Object_ptr port_ref); - - void add_consumer (const char *port_name, - ::Components::EventConsumerBase_ptr port_ref); - - protected: - typedef ACE_Hash_Map_Manager_Ex<const char *, - ::Components::FacetDescription_var, - ACE_Hash<const char *>, - ACE_Equal_To<const char *>, - ACE_Null_Mutex> - FacetTable; - - typedef ACE_Hash_Map_Manager_Ex<const char *, - ::Components::ConsumerDescription_var, - ACE_Hash<const char *>, - ACE_Equal_To<const char *>, - ACE_Null_Mutex> - ConsumerTable; - - FacetTable facet_table_; - ConsumerTable consumer_table_; - Session_Container * container_; - }; -} - -#include /**/ "ace/post.h" - -#endif /* CIAO_SERVANT_IMPL_T_H */ diff --git a/TAO/CIAO/DnC/ciao/Servant_Impl_T.cpp b/TAO/CIAO/DnC/ciao/Servant_Impl_T.cpp deleted file mode 100644 index 9fe130edd33..00000000000 --- a/TAO/CIAO/DnC/ciao/Servant_Impl_T.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// $Id$ - -#ifndef CIAO_SERVANT_IMPL_T_C -#define CIAO_SERVANT_IMPL_T_C - -#include "Servant_Impl_T.h" - -namespace CIAO -{ - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, - typename CONTEXT> - Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::Servant_Impl ( - EXEC * exe, - Session_Container * c - ) - : Servant_Impl_Base (c), - executor_ (EXEC::_duplicate (exe)) - { - } - - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, - typename CONTEXT> - Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::~Servant_Impl (void) - { - } - - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, - typename CONTEXT> - ::Components::FacetDescriptions * - Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_facets ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - ::Components::FacetDescriptions *tmp = 0; - ACE_NEW_RETURN (tmp, - ::Components::FacetDescriptions, - 0); - - ::Components::FacetDescriptions_var retval = tmp; - - retval->length (this->facet_table_.current_size ()); - CORBA::ULong i = 0; - - for (FacetTable::iterator iter = this->facet_table_.begin (); - iter != this->facet_table_.end (); - ++iter, ++i) - { - FacetTable::ENTRY & entry = *iter; - retval[i] = entry.int_id_; - } - - return retval._retn (); - } - - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, - typename CONTEXT> - ::Components::ConsumerDescriptions * - Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_consumers ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - ::Components::ConsumerDescriptions *tmp = 0; - ACE_NEW_RETURN (tmp, - ::Components::ConsumerDescriptions, - 0); - - ::Components::ConsumerDescriptions_var retval = tmp; - - retval->length (this->consumer_table_.current_size ()); - CORBA::ULong i = 0; - - for (ConsumerTable::iterator iter = this->consumer_table_.begin (); - iter != this->consumer_table_.end (); - ++iter, ++i) - { - ConsumerTable::ENTRY & entry = *iter; - retval[i] = entry.int_id_; - } - - return retval._retn (); - } -} - -#endif /* CIAO_SERVANT_IMPL_T_C */ diff --git a/TAO/CIAO/DnC/ciao/Servant_Impl_T.h b/TAO/CIAO/DnC/ciao/Servant_Impl_T.h deleted file mode 100644 index af8f19a0eb2..00000000000 --- a/TAO/CIAO/DnC/ciao/Servant_Impl_T.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Servant_Impl_T.h - * - * $Id$ - * - * This file contains the declaration of a mixin base class for - * the generated servant class. - * - * @authors Boris Kolpackov <boris@dre.vanderbilt.edu> - * Jeff Parsons <j.parsons@vanderbilt.edu> - */ -//============================================================================= - - -#ifndef CIAO_SERVANT_IMPL_T_H -#define CIAO_SERVANT_IMPL_T_H - -#include /**/ "ace/pre.h" - -#include "Servant_Impl_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -namespace CIAO -{ - class Session_Container; - - /** - * @class Servant_Impl - * - * @brief Mixin base class for generated servant. - * - * This class implements navigation and other operations - * common to all generated servants. - */ - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, - typename CONTEXT> - class Servant_Impl : public virtual BASE_SKEL, - public Servant_Impl_Base - { - public: - Servant_Impl (EXEC * exe, - Session_Container * c); - virtual ~Servant_Impl (void); - - virtual ::Components::FacetDescriptions * - get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual ::Components::ConsumerDescriptions * - get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - protected: - EXEC_VAR executor_; - - CONTEXT * context_; - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Servant_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Servant_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_SERVANT_IMPL_T_H */ diff --git a/TAO/CIAO/DnC/ciao/Server_init.cpp b/TAO/CIAO/DnC/ciao/Server_init.cpp deleted file mode 100644 index 43eaabcd598..00000000000 --- a/TAO/CIAO/DnC/ciao/Server_init.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ - -#include "Server_init.h" -#include "CIAO_common.h" -#include "CCM_ComponentC.h" -#include "Cookies.h" - -#include "ace/OS_NS_stdio.h" - -int -CIAO::Server_init (CORBA::ORB_ptr o) -{ - CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init, - Components::Cookie); - CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init, - CIAO::Cookie); - CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init, - Components::PortDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init, - Components::FacetDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init, - Components::ConnectionDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init, - Components::ReceptacleDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init, - Components::ConsumerDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init, - Components::EmitterDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init, - Components::SubscriberDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init, - Components::PublisherDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init, - Components::ConfigValue); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init, - Components::ComponentPortDescription); - return 0; -} - -int -CIAO::Utility::write_IOR (const char *pathname, - const char *ior) -{ - FILE* ior_output_file_ = - ACE_OS::fopen (pathname, "w"); - - if (ior_output_file_) - { - ACE_OS::fprintf (ior_output_file_, - "%s", - ior); - ACE_OS::fclose (ior_output_file_); - return 0; - } - - return -1; -} diff --git a/TAO/CIAO/DnC/ciao/Server_init.h b/TAO/CIAO/DnC/ciao/Server_init.h deleted file mode 100644 index d2cbfcc04f5..00000000000 --- a/TAO/CIAO/DnC/ciao/Server_init.h +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -/** - * @file Server_init.h - * - * Initializing CIAO Server side ORB, if they need to. - * I'm also puting some utilities functions here. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - */ - -#ifndef CIAO_SERVER_INIT_H -#define CIAO_SERVER_INIT_H -#include /**/ "ace/pre.h" - -#include "CIAO_Server_Export.h" - -#if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -namespace CORBA -{ - class ORB; - typedef ORB *ORB_ptr; -} - -namespace CIAO -{ - /** - * The initialize routine for any server that need to access - * component. This routine now simply registers various valuetype - * factories defined in CIAO_Component.pidl. Currently, this method - * should be call right after ORB initialization but we should try - * to register these stuff automatically. - */ - CIAO_SERVER_Export int Server_init (CORBA::ORB_ptr o); - - namespace Utility - { - /// Write a string (usually a stringified IOR) to a file - /// designated by the @c pathname. The file named will always get - /// overwritten. - CIAO_SERVER_Export int write_IOR (const char *pathname, - const char *IOR); - } -} - -#include /**/ "ace/post.h" -#endif /* CIAO_SERVER_INIT_H */ diff --git a/TAO/CIAO/DnC/ciao/Version.h b/TAO/CIAO/DnC/ciao/Version.h deleted file mode 100644 index e36f84e74ec..00000000000 --- a/TAO/CIAO/DnC/ciao/Version.h +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ -// This is an automatically generated file. - -#define CIAO_MAJOR_VERSION 0 -#define CIAO_MINOR_VERSION 4 -#define CIAO_BETA_VERSION 1 -#define CIAO_VERSION "0.4.1" diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp deleted file mode 100644 index ef03b09cec6..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "Config_Handlers/CompImplDesc_Handler.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - return run_test <CIAO::Config_Handler::CompImplDesc_Handler, Deployment::ComponentImplementationDescription> - (argc, argv, &CIAO::Config_Handler::CompImplDesc_Handler::process_ComponentImplementationDescription); -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp deleted file mode 100644 index b6a33919068..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "Config_Handlers/CompIntrDesc_Handler.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - return run_test <CIAO::Config_Handler::CompIntrDesc_Handler, Deployment::ComponentInterfaceDescription> - (argc, argv, &CIAO::Config_Handler::CompIntrDesc_Handler::process_ComponentInterfaceDescription); -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp deleted file mode 100644 index adf64ee1380..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "Config_Handlers/CompPkgDesc_Handler.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - return run_test <CIAO::Config_Handler::CompPkgDesc_Handler, Deployment::ComponentPackageDescription> - (argc, argv, &CIAO::Config_Handler::CompPkgDesc_Handler::process_ComponentPackageDescription); -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/Domain_Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/Domain_Handler_Test.cpp deleted file mode 100644 index 4d0cf09ef99..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/Domain_Handler_Test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "Config_Handlers/Domain_Handler.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - return run_test <CIAO::Config_Handler::Domain_Handler, Deployment::Domain> - (argc, argv, &CIAO::Config_Handler::Domain_Handler::process_domain); -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.ccd deleted file mode 100644 index f8a0c2be6bf..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.ccd +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Airframe Component</label> - <UUID>058178f1-430a-460c-927a-d3c98b4ec860</UUID> - <specificType>IDL:BasicSP/BMClosedED:1.0</specificType> - <supportedType>IDL:BasicSP/BMClosedED:1.0</supportedType> - <port> - <name>in_avail</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType> - <specificType>IDL:BasicSP/DataAvailable:1.0</specificType> - <kind>EventConsumer</kind> - </port> - - <port> - <name>out_avail</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType> - <specificType>IDL:BasicSP/DataAvailable:1.0</specificType> - <kind>EventPublisher</kind> - </port> - - <port> - <name>dataout</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:BasicSP/ReadData:1.0</supportedType> - <specificType>IDL:BasicSP/ReadData:1.0</specificType> - <kind>Facet</kind> - </port> - - <port> - <name>datain</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:BasicSP/ReadData:1.0</supportedType> - <specificType>IDL:BasicSP/ReadData:1.0</specificType> - <kind>SimplexReceptacle</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.cid b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.cid deleted file mode 100644 index 69d19585bee..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Airframe Implementation</label> - <UUID>66a409c2-fa3a-48ea-be50-482dec4ae7a2</UUID> - <implements href="Airframe.ccd"/> - <monolithicImpl> - <primaryArtifact> - <name>BMClosedED_Stub</name> - <referencedArtifact href="Airframe_Stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>BMClosedED_Svnt</name> - <referencedArtifact href="Airframe_Svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>BMClosedED_Exec</name> - <referencedArtifact href="Airframe_Exec.iad"/> - </primaryArtifact> - </monolithicImpl> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>BMClosedED.ior</string> - </value> - </value> - </configProperty> -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.cpd deleted file mode 100644 index 2b8f461581b..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe.cpd +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Airframe Package </label> - <UUID>3c4c5adf-ae85-4b18-a404-a7c4887d6f7d</UUID> - <realizes href="Airframe.ccd"/> - <implementation> - <name>BMClosedED</name> - <referencedImplementation href="Airframe.cid"/> - </implementation> -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad deleted file mode 100644 index 7b70be3fd5f..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Airframe Executor Artifact</label> - <UUID>0f76b3d3-3d50-4d65-88b1-e26b60b624dd</UUID> - <location>BMClosedED_exec</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>BMClosedED_Stub</name> - <referencedArtifact href="Airframe_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createBMClosedEDHome_Impl</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad deleted file mode 100644 index b3e7013091d..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Airframe Stub Artifact</label> - <UUID>93bbdf7d-d3f7-4227-bb75-b0562ac15b92</UUID> - <location>BMClosedED_stub</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad deleted file mode 100644 index cb27b660286..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Airframe Servant Artifact</label> - <UUID>88f66272-bdb6-488b-9d95-cfa63317c616</UUID> - <location>BMClosedED_svnt</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>BMClosedED_Stub</name> - <referencedArtifact href="Airframe_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createBMClosedEDHome_Servant</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Deployment.xsd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Deployment.xsd deleted file mode 100644 index c8a6399730b..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Deployment.xsd +++ /dev/null @@ -1,776 +0,0 @@ -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:Deployment="http://www.omg.org/Deployment" - targetNamespace="http://www.omg.org/Deployment"> - - <xsd:import namespace="http://www.omg.org/XMI" schemaLocation="XMI.xsd" /> - - - <xsd:complexType name="Any"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Any" type="Deployment:Any"/> - <xsd:complexType name="DataType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="kind" type="Deployment:TCKind"/> - <xsd:element name="enum" type="Deployment:EnumType"/> - <xsd:element name="objref" type="Deployment:ObjrefType"/> - <xsd:element name="boundedString" type="Deployment:BoundedStringType"/> - <xsd:element name="fixed" type="Deployment:FixedType"/> - <xsd:element name="array" type="Deployment:ArrayType"/> - <xsd:element name="sequence" type="Deployment:SequenceType"/> - <xsd:element name="alias" type="Deployment:AliasType"/> - <xsd:element name="struct" type="Deployment:StructType"/> - <xsd:element name="value" type="Deployment:ValueType"/> - <xsd:element name="union" type="Deployment:UnionType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataType" type="Deployment:DataType"/> - <xsd:complexType name="DataValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="short" type="xsd:short"/> - <xsd:element name="long" type="xsd:int"/> - <xsd:element name="ushort" type="xsd:unsignedShort"/> - <xsd:element name="ulong" type="xsd:unsignedInt"/> - <xsd:element name="float" type="xsd:float"/> - <xsd:element name="double" type="xsd:double"/> - <xsd:element name="boolean" type="xsd:boolean"/> - <xsd:element name="octet" type="xsd:unsignedByte"/> - <xsd:element name="opaque" type="xsd:base64Binary"/> - <xsd:element name="objref" type="xsd:string"/> - <xsd:element name="enum" type="xsd:string"/> - <xsd:element name="string" type="xsd:string"/> - <xsd:element name="longlong" type="xsd:long"/> - <xsd:element name="ulonglong" type="xsd:unsignedLong"/> - <xsd:element name="longdouble" type="xsd:double"/> - <xsd:element name="fixed" type="xsd:string"/> - <xsd:element name="any" type="Deployment:Any"/> - <xsd:element name="typecode" type="Deployment:DataType"/> - <xsd:element name="element" type="Deployment:DataValue"/> - <xsd:element name="discriminator" type="Deployment:DataValue"/> - <xsd:element name="value" type="Deployment:DataValue"/> - <xsd:element name="boxedValue" type="Deployment:DataValue"/> - <xsd:element name="member" type="Deployment:NamedValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataValue" type="Deployment:DataValue"/> - - - <xsd:complexType name="EnumType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="EnumType" type="Deployment:EnumType"/> - <xsd:complexType name="ObjrefType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - - - <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/> - <xsd:complexType name="BoundedStringType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="BoundedStringType" type="Deployment:BoundedStringType"/> - <xsd:complexType name="FixedType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="digits" type="xsd:string"/> - <xsd:element name="scale" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="FixedType" type="Deployment:FixedType"/> - <xsd:complexType name="ArrayType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="length" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArrayType" type="Deployment:ArrayType"/> - <xsd:complexType name="SequenceType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SequenceType" type="Deployment:SequenceType"/> - <xsd:complexType name="AliasType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AliasType" type="Deployment:AliasType"/> - <xsd:complexType name="StructType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="Deployment:StructMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructType" type="Deployment:StructType"/> - <xsd:complexType name="StructMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructMemberType" type="Deployment:StructMemberType"/> - <xsd:complexType name="ValueType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="modifier" type="xsd:string"/> - <xsd:element name="baseType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:ValueMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueType" type="Deployment:ValueType"/> - <xsd:complexType name="ValueMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="visibility" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueMemberType" type="Deployment:ValueMemberType"/> - <xsd:complexType name="UnionType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="default" type="Deployment:UnionMemberType"/> - <xsd:element name="discriminatorType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:UnionMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionType" type="Deployment:UnionType"/> - <xsd:complexType name="UnionMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="label" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionMemberType" type="Deployment:UnionMemberType"/> - <xsd:complexType name="NamedValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedValue" type="Deployment:NamedValue"/> - <xsd:complexType name="Bridge"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connect" type="Deployment:Interconnect"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Bridge" type="Deployment:Bridge"/> - <xsd:complexType name="Interconnect"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Bridge"/> - <xsd:element name="connect" type="Deployment:Node"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Interconnect" type="Deployment:Interconnect"/> - <xsd:complexType name="Node"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Interconnect"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Node" type="Deployment:Node"/> - <xsd:complexType name="Resource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Resource" type="Deployment:Resource"/> - <xsd:complexType name="SharedResource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SharedResource" type="Deployment:SharedResource"/> - <xsd:complexType name="Domain"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="interconnect" type="Deployment:Interconnect"/> - <xsd:element name="bridge" type="Deployment:Bridge"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Domain" type="Deployment:Domain"/> - <xsd:complexType name="PlanPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanPropertyMapping" type="Deployment:PlanPropertyMapping"/> - <xsd:complexType name="PlanSubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPropertyReference" type="Deployment:PlanSubcomponentPropertyReference"/> - <xsd:complexType name="PlanSubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPortEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:complexType name="PlanConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanConnectionDescription" type="Deployment:PlanConnectionDescription"/> - <xsd:complexType name="InstanceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceDeploymentDescription" type="Deployment:InstanceDeploymentDescription"/> - <xsd:complexType name="MonolithicDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicDeploymentDescription" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:complexType name="ArtifactDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArtifactDeploymentDescription" type="Deployment:ArtifactDeploymentDescription"/> - - - <xsd:complexType name="DeploymentPlan"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - <xsd:element name="connection" type="Deployment:PlanConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DeploymentPlan" type="Deployment:DeploymentPlan"/> - - - <xsd:complexType name="ResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ResourceDeploymentDescription" type="Deployment:ResourceDeploymentDescription"/> - <xsd:complexType name="InstanceResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceResourceDeploymentDescription" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:complexType name="ConnectionResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="targetName" type="xsd:string"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ConnectionResourceDeploymentDescription" type="Deployment:ConnectionResourceDeploymentDescription"/> - <xsd:complexType name="Capability"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Capability" type="Deployment:Capability"/> - <xsd:complexType name="ComponentPropertyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPropertyDescription" type="Deployment:ComponentPropertyDescription"/> - <xsd:complexType name="ComponentPortDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="exclusiveProvider" type="xsd:string"/> - <xsd:element name="exclusiveUser" type="xsd:string"/> - <xsd:element name="optional" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPortDescription" type="Deployment:ComponentPortDescription"/> - <xsd:complexType name="ComponentInterfaceDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="idlFile" type="xsd:string"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="port" type="Deployment:ComponentPortDescription"/> - <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/> - <xsd:complexType name="ImplementationArtifactDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationArtifactDescription" type="Deployment:ImplementationArtifactDescription"/> - <xsd:complexType name="MonolithicImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicImplementationDescription" type="Deployment:MonolithicImplementationDescription"/> - <xsd:complexType name="AssemblyPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyPropertyMapping" type="Deployment:AssemblyPropertyMapping"/> - <xsd:complexType name="SubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPropertyReference" type="Deployment:SubcomponentPropertyReference"/> - <xsd:complexType name="SubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPortEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:complexType name="AssemblyConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyConnectionDescription" type="Deployment:AssemblyConnectionDescription"/> - <xsd:complexType name="SubcomponentInstantiationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentInstantiationDescription" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:complexType name="ComponentAssemblyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentAssemblyDescription" type="Deployment:ComponentAssemblyDescription"/> - <xsd:complexType name="ComponentImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/> - <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="capability" type="Deployment:Capability"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentImplementationDescription" type="Deployment:ComponentImplementationDescription"/> - <xsd:complexType name="ComponentPackageReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredUUID" type="xsd:string"/> - <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageReference" type="Deployment:ComponentPackageReference"/> - <xsd:complexType name="ComponentPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageDescription" type="Deployment:ComponentPackageDescription"/> - <xsd:complexType name="PackageConfiguration"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/> - <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackageConfiguration" type="Deployment:PackageConfiguration"/> - <xsd:complexType name="PackagedComponentImplementation"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackagedComponentImplementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:complexType name="NamedImplementationArtifact"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedImplementationArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:complexType name="ImplementationRequirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="resourcePort" type="xsd:string"/> - <xsd:element name="componentPort" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationRequirement" type="Deployment:ImplementationRequirement"/> - <xsd:complexType name="RequirementSatisfier"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="RequirementSatisfier" type="Deployment:RequirementSatisfier"/> - <xsd:complexType name="SatisfierProperty"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SatisfierProperty" type="Deployment:SatisfierProperty"/> - <xsd:complexType name="Requirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Requirement" type="Deployment:Requirement"/> - <xsd:complexType name="Property"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Property" type="Deployment:Property"/> - <xsd:complexType name="ExternalReferenceEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="location" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:complexType name="ComponentExternalPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:complexType name="ImplementationDependency"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredType" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/> - <xsd:complexType name="TopLevelPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="package" type="Deployment:PackageConfiguration"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="TopLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/> - <xsd:simpleType name="TCKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="tk_null"/> - <xsd:enumeration value="tk_void"/> - <xsd:enumeration value="tk_short"/> - <xsd:enumeration value="tk_long"/> - <xsd:enumeration value="tk_ushort"/> - <xsd:enumeration value="tk_ulong"/> - <xsd:enumeration value="tk_float"/> - <xsd:enumeration value="tk_double"/> - <xsd:enumeration value="tk_boolean"/> - <xsd:enumeration value="tk_char"/> - <xsd:enumeration value="tk_octet"/> - <xsd:enumeration value="tk_any"/> - <xsd:enumeration value="tk_TypeCode"/> - <xsd:enumeration value="tk_Principal"/> - <xsd:enumeration value="tk_objref"/> - <xsd:enumeration value="tk_struct"/> - <xsd:enumeration value="tk_union"/> - <xsd:enumeration value="tk_enum"/> - <xsd:enumeration value="tk_string"/> - <xsd:enumeration value="tk_sequence"/> - <xsd:enumeration value="tk_array"/> - <xsd:enumeration value="tk_alias"/> - <xsd:enumeration value="tk_except"/> - <xsd:enumeration value="tk_longlong"/> - <xsd:enumeration value="tk_ulonglong"/> - <xsd:enumeration value="tk_longdouble"/> - <xsd:enumeration value="tk_wchar"/> - <xsd:enumeration value="tk_wstring"/> - <xsd:enumeration value="tk_wfixed"/> - <xsd:enumeration value="tk_value"/> - <xsd:enumeration value="tk_value_box"/> - <xsd:enumeration value="tk_native"/> - <xsd:enumeration value="tk_abstract_interface"/> - <xsd:enumeration value="tk_local_interface"/> - <xsd:enumeration value="tk_component"/> - <xsd:enumeration value="tk_home"/> - <xsd:enumeration value="tk_event"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ResourceUsageKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="None"/> - <xsd:enumeration value="InstanceUsesResource"/> - <xsd:enumeration value="ResourceUsesInstance"/> - <xsd:enumeration value="PortUsesResource"/> - <xsd:enumeration value="ResourceUsesPort"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CCMComponentPortKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Facet"/> - <xsd:enumeration value="SimplexReceptacle"/> - <xsd:enumeration value="MultiplexReceptacle"/> - <xsd:enumeration value="EventEmitter"/> - <xsd:enumeration value="EventPublisher"/> - <xsd:enumeration value="EventConsumer"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SatisfierPropertyKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Quantity"/> - <xsd:enumeration value="Capacity"/> - <xsd:enumeration value="Minimum"/> - <xsd:enumeration value="Maximum"/> - <xsd:enumeration value="Attribute"/> - <xsd:enumeration value="Selection"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Domain.cdd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Domain.cdd deleted file mode 100644 index 6f5277d799e..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Domain.cdd +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<Deployment:Domain - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> -<label>HUDisplay Domain</label> -<UUID>effd4bd0-6db0-4c50-9bb7-db9decebae1c</UUID> -<node> - <name>EC</name> - <label>Timer's Node</label> -</node> -<node> - <name>BMDisplay</name> - <label>NavDisplay's Node</label> -</node> -<node> - <name>BMDevice</name> - <label>GPS's Node</label> -</node> -<node> - <name>BMClosedED</name> - <label>Airframe's Node</label> -</node> -</Deployment:Domain> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.ccd deleted file mode 100644 index 3d7d99491c8..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.ccd +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>GPS Component</label> - <UUID>058178f1-430a-460c-927a-d3c98b4ec860</UUID> - <specificType>IDL:BasicSP/BMDevice:1.0</specificType> - <supportedType>IDL:BasicSP/BMDevice:1.0</supportedType> - <port> - <name>timeout</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <supportedType>IDL:BasicSP/TimeOut:1.0</supportedType> - <specificType>IDL:BasicSP/TimeOut:1.0</specificType> - <kind>EventConsumer</kind> - </port> - - <port> - <name>data_available</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType> - <specificType>IDL:BasicSP/DataAvailable:1.0</specificType> - <kind>EventPublisher</kind> - </port> - - <port> - <name>data_read</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:BasicSP/ReadData:1.0</supportedType> - <specificType>IDL:BasicSP/ReadData:1.0</specificType> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.cid b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.cid deleted file mode 100644 index ba56a63c8f5..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>GPS Implementation</label> - <UUID>154cf3cd-1770-4e92-b19b-8c2c921fea38</UUID> - <implements href="GPS.ccd"/> - <monolithicImpl> - <primaryArtifact> - <name>BMDevice_Stub</name> - <referencedArtifact href="GPS_Stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>BMDevice_Svnt</name> - <referencedArtifact href="GPS_Svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>BMDevice_Exec</name> - <referencedArtifact href="GPS_Exec.iad"/> - </primaryArtifact> - </monolithicImpl> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>BMDevice.ior</string> - </value> - </value> - </configProperty> -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.cpd deleted file mode 100644 index 3f1424967f4..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS.cpd +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>GPS System</label> - - <UUID>b55c949b-a9e8-41dd-bbb5-67d8f610dffe</UUID> - - <realizes href="GPS.ccd"/> - - <implementation> - <name>GPSImpl</name> - <referencedImplementation href="GPS.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Exec.iad deleted file mode 100644 index c6724d39c8a..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Exec.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>GPS Executor Artifact</label> - <UUID>9617ed9a-d127-4797-836a-0a3b3d7d8b12</UUID> - <location>BMDevice_exec</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>BMDevice_Stub</name> - <referencedArtifact href="GPS_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createBMDeviceHome_Impl</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Stub.iad deleted file mode 100644 index 6968ec7ad74..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Stub.iad +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>GPS Stub Artifact</label> - <UUID>c7264c15-d373-4d01-84ee-d37536599240</UUID> - <location>BMDevice_stub</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad deleted file mode 100644 index a087459cc84..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>GPS Servant Artifact</label> - <UUID>657440e8-9143-494b-928c-2a3df84e509f</UUID> - <location>BMDevice_svnt</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>BMDevice_Stub</name> - <referencedArtifact href="GPS_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createBMDeviceHome_Servant</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cdp b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cdp deleted file mode 100644 index 613eec58754..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cdp +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:DeploymentPlan - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>HUDisplay Deployment Plan</label> - <instance xmi:id="BMClosedED_Instance"> - <name>BMClosedED_Instance</name> - <node>BMClosedED</node> - </instance> - <instance xmi:id="BMDevice_Instance"> - <name>BMDevice_Instance</name> - <node>BMClosedED</node> - </instance> - <instance xmi:id="BMDisplay_Instance"> - <name>BMDisplay_Instance</name> - <node>BMClosedED</node> - </instance> - <instance xmi:id="EC_Instance"> - <name>EC_Instance</name> - <node>EC</node> - </instance> -</Deployment:DeploymentPlan> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cid b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cid deleted file mode 100644 index 3746e7cae24..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cid +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>HUDisplay Assembly</label> - <UUID>effd4bd0-6db0-4c50-9bb7-db9decebae1c</UUID> - <assemblyImpl> - <instance xmi:id="a_GPS"> - <name>BMDevice_Instance</name> - <package href="GPS.cpd"/> - </instance> - <instance xmi:id="a_Airframe"> - <name>BMClosedED_Instance</name> - <package href="Airframe.cpd"/> - </instance> - <instance xmi:id="a_NavDisplay"> - <name>BMDisplay_Instance</name> - <package href="NavDisplay.cpd"/> - </instance> - <instance xmi:id="a_Timer"> - <name>EC_Instance</name> - <package href="Timer.cpd"/> - </instance> - <connection> - <name>Timer_NavDisplay</name> - <internalEndpoint> - <portName>timeout</portName> - <instance xmi:idref="a_Timer"/> - </internalEndpoint> - <internalEndpoint> - <portName>timeout</portName> - <instance xmi:idref="a_GPS"/> - </internalEndpoint> - </connection> - <connection> - <name>GPS_Airframe</name> - <internalEndpoint> - <portName>data_available</portName> - <instance xmi:idref="a_GPS"/> - </internalEndpoint> - <internalEndpoint> - <portName>in_avail</portName> - <instance xmi:idref="a_Airframe"/> - </internalEndpoint> - </connection> - <connection> - <name>Airframe_GPS</name> - <internalEndpoint> - <portName>datain</portName> - <instance xmi:idref="a_Airframe"/> - </internalEndpoint> - <internalEndpoint> - <portName>data_read</portName> - <instance xmi:idref="a_GPS"/> - </internalEndpoint> - </connection> - <connection> - <name>Airframe_NavDisplay</name> - <internalEndpoint> - <portName>data_ready</portName> - <instance xmi:idref="a_NavDisplay"/> - </internalEndpoint> - <internalEndpoint> - <portName>out_avail</portName> - <instance xmi:idref="a_Airframe"/> - </internalEndpoint> - </connection> - <connection> - <name>NavDisplay_Airframe</name> - <internalEndpoint> - <portName>comp_data</portName> - <instance xmi:idref="a_NavDisplay"/> - </internalEndpoint> - <internalEndpoint> - <portName>dataout</portName> - <instance xmi:idref="a_Airframe"/> - </internalEndpoint> - </connection> - </assemblyImpl> -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cpd deleted file mode 100644 index 9be7a1e0ef2..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>HUDisplay Package</label> - <UUID>823e4287-f53c-4caa-8619-f3dfda4c4998</UUID> - <implementation> - <name>HUDisplay</name> - <referencedImplementation href="HUDisplay.cid"/> - </implementation> -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.pcd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.pcd deleted file mode 100644 index cbcec4e9113..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/HUDisplay.pcd +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:PackageConfiguration -xmlns:Deployment="http://www.omg.org/Deployment" -xmlns:xmi="http://www.omg.org/XMI" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>HUDisplay Configuration for Unix machines</label> - <UUID>559d65e8-0407-48c0-a158-dafe21360fef</UUID> - <basePackage href="HUDisplay.cpd"/> -</Deployment:PackageConfiguration> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Libraries.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Libraries.iad deleted file mode 100644 index 720a7ce8219..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Libraries.iad +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Common Libraries</label> - <UUID>6bae4fcd-c71c-44b4-a0d4-0e4199ce1a49</UUID> - <location>$ACE_ROOT/lib/libACE</location> - <location>$ACE_ROOT/lib/libTAO</location> - <location>$ACE_ROOT/lib/libCIAO_Client</location> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.ccd deleted file mode 100644 index 175d4067000..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.ccd +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>NavDisplay Component </label> - <UUID>589462ed-e88f-4f96-a7a7-359cdc333d63</UUID> - <specificType>IDL:BasicSP/BMDisplay:1.0</specificType> - <supportedType>IDL:BasicSP/BMDisplay:1.0</supportedType> - <idlFile>BMDisplay.idl</idlFile> - <port> - <name>data_ready</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType> - <specificType>IDL:BasicSP/DataAvailable:1.0</specificType> - <kind>EventConsumer</kind> - </port> - - <port> - <name>comp_data</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <supportedType>IDL:BasicSP/ReadData:1.0</supportedType> - <specificType>IDL:BasicSP/ReadData:1.0</specificType> - <kind>SimplexReceptacle</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cid b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cid deleted file mode 100644 index 30b66fea0b2..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>NavDisplay Implementation</label> - <UUID>0a52c9de-7852-42e4-aac7-bf478169a21a</UUID> - <implements href="NavDisplay.ccd"/> - <monolithicImpl> - <primaryArtifact> - <name>BMDisplay_Stub</name> - <referencedArtifact href="NavDisplay_Stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>BMDisplay_Svnt</name> - <referencedArtifact href="NavDisplay_Svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>BMDisplay_Exec</name> - <referencedArtifact href="NavDisplay_Exec.iad"/> - </primaryArtifact> - </monolithicImpl> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>BMDisplay.ior</string> - </value> - </value> - </configProperty> -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cpd deleted file mode 100644 index 04862555769..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cpd +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Navigation Display Package</label> - <UUID>a5923ef4-9c62-4458-9fa4-869b53d834ca</UUID> - <realizes href="NavDisplay.ccd"/> - <implementation> - <name>BMDisplay</name> - <referencedImplementation href="NavDisplay.cid"/> - </implementation> -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad deleted file mode 100644 index fbd092506a8..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>NavDisplay Servant Artifact</label> - <UUID>412f8156-7913-4651-9110-f7a3f98c7a83</UUID> - <location>BMDisplay_exec</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>BMDisplay_Stub</name> - <referencedArtifact href="NavDisplay_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createBMDisplayHome_Impl</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad deleted file mode 100644 index e79eeea1f4e..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>NavDisplay Stub Artifact</label> - <UUID>4d02c22b-768e-4d1a-bf07-76da2f5d1fbf</UUID> - <location>BMDisplay_Stub</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad deleted file mode 100644 index 05acef61d72..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>NavDisplay Servant Artifact</label> - <UUID>ad052b10-0806-43c7-9ccc-2dfeda0e0e03</UUID> - <location>BMDisplay_svnt</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>BMDisplay_Stub</name> - <referencedArtifact href="NavDisplay_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createBMDisplayHome_Servant</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.ccd deleted file mode 100644 index ba44bcf1a00..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.ccd +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>Timer Component</label> - <UUID>803f8fc7-55de-4a20-81eb-ae951d85b7f4</UUID> - <specificType>IDL:BasicSP/EC:1.0</specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> - <property> - <name>hertz</name> - <type> - <kind>tk_long</kind> - </type> - </property> - <port> - <name>supports</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:BasicSP/trigger:1.0</supportedType> - <kind>Facet</kind> - </port> - <port> - <name>timeout</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:BasicSP/TimeOut:1.0</supportedType> - <specificType>IDL:BasicSP/TimeOut:1.0</specificType> - <kind>EventPublisher</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.cid b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.cid deleted file mode 100644 index ac50742d0e3..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.cid +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Timer Implementation</label> - <UUID>789e1be2-703f-4bd3-af50-b400eef91fd0</UUID> - <implements href="Timer.ccd"/> - <monolithicImpl> - <primaryArtifact> - <name>EC_Stub</name> - <referencedArtifact href="Timer_Stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>EC_Svnt</name> - <referencedArtifact href="Timer_Svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>EC_Exec</name> - <referencedArtifact href="Timer_Exec.iad"/> - </primaryArtifact> - </monolithicImpl> - <configProperty> - <name>hertz</name> - <value> - <type> - <kind>tk_long</kind> - </type> - <value> - <long>40</long> - </value> - </value> - </configProperty> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>EC.ior</string> - </value> - </value> - </configProperty> -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.cpd deleted file mode 100644 index 167b1238934..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer.cpd +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Timer Package</label> - <UUID>07ebf947-2174-4a3b-bd37-bcb92986eaf4</UUID> - <realizes href="Timer.ccd"/> - <implementation> - <name>EC</name> - <referencedImplementation href="Timer.cid"/> - </implementation> -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Exec.iad deleted file mode 100644 index 222fc22bc9e..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Exec.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Timer Executor Artifact</label> - <UUID>5e4f2366-3810-4d4c-a269-5788a525cbe1</UUID> - <location>EC_exec</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>EC_Stub</name> - <referencedArtifact href="Timer_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createECHome_Impl</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Stub.iad deleted file mode 100644 index c9d15dcc82e..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Stub.iad +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Timer Stub Artifact</label> - <UUID>93bbdf7d-d3f7-4227-bb75-b0562ac15b92</UUID> - <location>EC_stub</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad deleted file mode 100644 index f870112f143..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>Timer Servant Artifact</label> - <UUID>04e4d246-e6eb-4b0e-8e32-60b996497cea</UUID> - <location>EC_svnt</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>EC_Stub</name> - <referencedArtifact href="Timer_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createECHome_Servant</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/XMI.xsd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/XMI.xsd deleted file mode 100644 index f4adac91934..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/XMI.xsd +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'> - <xsd:attribute name="id" type="xsd:ID" /> - <xsd:attributeGroup name="IdentityAttribs"> - <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="LinkAttribs"> - <xsd:attribute name="href" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="ObjectAttribs"> - <xsd:attributeGroup ref="xmi:IdentityAttribs" /> - <xsd:attributeGroup ref="xmi:LinkAttribs" /> - <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" /> - </xsd:attributeGroup> - <xsd:complexType name="Extension"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="lax" /> - </xsd:choice> - <xsd:attribute ref="xmi:id" /> - <xsd:attributeGroup ref="xmi:ObjectAttribs" /> - <xsd:attribute name="extender" type="xsd:string" use="optional" /> - <xsd:attribute name="extenderID" type="xsd:string" use="optional" /> - </xsd:complexType> - <xsd:element name="Extension" type="xmi:Extension" /> - <xsd:complexType name="Any"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="skip" /> - </xsd:choice> - <xsd:anyAttribute processContents="skip" /> - </xsd:complexType> -</xsd:schema> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/package.tpd b/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/package.tpd deleted file mode 100644 index 9096beb2c48..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/HUDisplay/package.tpd +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:TopLevelPackageDescription -xmlns:Deployment="http://www.omg.org/Deployment" -xmlns:xmi="http://www.omg.org/XMI" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <package href="HUDisplay.pcd"/> -</Deployment:TopLevelPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.cpp deleted file mode 100644 index a00a939f113..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifdef ACE_HAS_BROKEN_NESTED_TEMPLATES - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("DaNCe internal testing doesn't work with compilers ") - ACE_TEXT ("not supporting nested templates (like VC6).\n"))); - return -1; -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES - diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.h b/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.h deleted file mode 100644 index a5598e8a55c..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.h +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -#ifndef HANDLER_TEST_H -#define HANDLER_TEST_H - -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "tao/Exception.h" -#include "Config_Handlers/XercesString.h" -#include "Config_Handlers/Config_Handler_export.h" -#include "Config_Handlers/DnC_Dump.h" -#include "Config_Handlers/Config_Error_Handler.h" - -#include <xercesc/util/XMLUniDefs.hpp> -#include <xercesc/dom/DOM.hpp> - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMAttr; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMNodeList; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -template <typename HANDLER, typename DATA> -int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)); - -#include "Handler_Test.i" - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES - -#endif // HANDLER_TEST_H - diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.i b/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.i deleted file mode 100644 index eb6041b83d0..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Test.i +++ /dev/null @@ -1,197 +0,0 @@ -// $Id$ - -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "ace/Auto_Ptr.h" -#include "tao/Exception.h" -#include "Config_Handlers/XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include "Config_Handlers/Config_Handler_export.h" -#include "Config_Handlers/DnC_Dump.h" -#include "Config_Handlers/Config_Error_Handler.h" - -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMAttr; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMNodeList; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -inline void -usage (const ACE_TCHAR* program) -{ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Usage: %s -u <URI>\n") - ACE_TEXT (" <URI>: URI identifying the resource\n"), - program)); -} - -template <typename HANDLER, typename DATA> -int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)) -{ - ACE_TCHAR* url = 0; - - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:")); - int c; - - while ((c = get_opt ()) != EOF) - { - switch (c) - { - case 'u': - url = get_opt.opt_arg(); - break; - default: - usage(argv[0]); - return -1; - } - } - - if (url == 0) { - usage(argv[0]); - return -1; - } - - // Initialize the ORB so that CORBA::Any will work - // - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); - - // Initialize the Xerces run-time - try - { - xercesc::XMLPlatformUtils::Initialize(); - } - - catch (const XMLException& e) - { - char* message = XMLString::transcode (e.getMessage()); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message)); - return 1; - } - - try - { - - // Instantiate the DOM parser. - static const XMLCh gLS[] = { xercesc::chLatin_L, - xercesc::chLatin_S, - xercesc::chNull }; - - // Get an implementation of the Load-Store (LS) interface - DOMImplementation* impl - = DOMImplementationRegistry::getDOMImplementation(gLS); - - auto_ptr<DOMImplementation> cleanup_impl (impl); - - // Create a DOMBuilder - DOMBuilder* parser = - ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); - - auto_ptr<DOMBuilder> cleanup_builder (parser); - - // Discard comment nodes in the document - parser->setFeature (XMLUni::fgDOMComments, false); - - // Disable datatype normalization. The XML 1.0 attribute value - // normalization always occurs though. - parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true); - - // Do not create EntityReference nodes in the DOM tree. No - // EntityReference nodes will be created, only the nodes - // corresponding to their fully expanded sustitution text will be - // created. - parser->setFeature (XMLUni::fgDOMEntities, false); - - // Perform Namespace processing. - parser->setFeature (XMLUni::fgDOMNamespaces, true); - - // Perform Validation - parser->setFeature (XMLUni::fgDOMValidation, true); - - // Do not include ignorable whitespace in the DOM tree. - parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false); - - // Enable the parser schema support. - parser->setFeature (XMLUni::fgXercesSchema, true); - - // Enable full schema constraint checking, including checking which - // may be time-consuming or memory intensive. Currently, particle - // unique attribution constraint checking and particle derivation - // restriction checking are controlled by this option. - parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true); - - // The parser will treat validation error as fatal and will exit. - parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true); - - CIAO::Config_Handler::Config_Error_Handler handler; - parser->setErrorHandler(&handler); - - DOMDocument* doc = parser->parseURI(url); - auto_ptr<DOMDocument> cleanup_doc (doc); - - if (handler.getErrors()) - { - return 1; - } - HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT); - - DATA data; - (obj.*func)(data); - Deployment::DnC_Dump::dump (data); - //domain_handler.dump(domain); - - // parser->release (); - } - catch (const DOMException& e) - { - const unsigned int maxChars = 2047; - XMLCh errText[maxChars + 1]; - - ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \n", url)); - ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code)); - if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars)) - { - char* message = XMLString::transcode (errText); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_ERROR ((LM_ERROR, "Message is: %s\n", message)); - } - return 1; - } - catch (const XMLException& e) - { - char* message = XMLString::transcode (e.getMessage()); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message)); - return 1; - } - catch (CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: "); - return 1; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Caught unknown exception\n")); - return 1; - } - - xercesc::XMLPlatformUtils::Terminate(); - return 0; -} diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Tests.mpc b/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Tests.mpc deleted file mode 100644 index f8bda5acc48..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/Handler_Tests.mpc +++ /dev/null @@ -1,57 +0,0 @@ -//$Id$ - -project (Domain_Handler_Test) : handler_test { - exename = domain - - Source_Files { - Domain_Handler_Test.cpp - } -} - -project (CompImpl_Handler_Test) : handler_test { - exename = compimpldesc - - Source_Files { - CompImplDesc_Handler_Test.cpp - } -} - -project (CompIntr_Handler_Test) : handler_test { - exename = compintrdesc - - Source_Files { - CompIntrDesc_Handler_Test.cpp - } -} - -project (CompPkg_Handler_Test) : handler_test { - exename = comppkgdesc - - Source_Files { - CompPkgDesc_Handler_Test.cpp - } -} - -project (IAD_Handler_Test) : handler_test { - exename = iad - - Source_Files { - IAD_Handler_Test.cpp - } -} - -project (PC_Handler_Test) : handler_test { - exename = pc - - Source_Files { - PC_Handler_Test.cpp - } -} - -project (Plan_Handler_Test) : handler_test { - exename = plan - - Source_Files { - Plan_Handler_Test.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/IAD_Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/IAD_Handler_Test.cpp deleted file mode 100644 index c71e11fce28..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/IAD_Handler_Test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "Config_Handlers/IAD_Handler.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - return run_test <CIAO::Config_Handler::IAD_Handler, Deployment::ImplementationArtifactDescription> - (argc, argv, &CIAO::Config_Handler::IAD_Handler::process_ImplementationArtifactDescription); -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/PC_Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/PC_Handler_Test.cpp deleted file mode 100644 index e8a8980108b..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/PC_Handler_Test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "Config_Handlers/PC_Handler.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - return run_test <CIAO::Config_Handler::PC_Handler, Deployment::PackageConfiguration> - (argc, argv, &CIAO::Config_Handler::PC_Handler::process_PackageConfiguration); -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/Plan_Handler_Test.cpp b/TAO/CIAO/DnC/tests/Config_Handlers/Plan_Handler_Test.cpp deleted file mode 100644 index e42d4d345a3..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/Plan_Handler_Test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "Handler_Test.h" - -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES - -#include "Config_Handlers/Plan_Handler.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - return run_test <CIAO::Config_Handler::Plan_Handler, Deployment::DeploymentPlan> - (argc, argv, &CIAO::Config_Handler::Plan_Handler::process_plan); -} - -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ACE.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ACE.iad deleted file mode 100644 index acd8ded1358..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ACE.iad +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>ACE Library</label> - - <UUID>98E5D8B9-C40A-4E5D-9F8C-382E54C007C5</UUID> - - <location>libACE</location> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/CIAO.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/CIAO.iad deleted file mode 100644 index 1b0a0aeef64..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/CIAO.iad +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>CIAO Library</label> - - <UUID>6A4D9269-9BC0-4E5D-8F64-EFBE71170D7C</UUID> - - <location>libCIAO_Container</location> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/DefaultConfiguration.pcd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/DefaultConfiguration.pcd deleted file mode 100644 index d1da399f27a..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/DefaultConfiguration.pcd +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:PackageConfiguration xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <basePackage href="RobotAssembly.cpd"/> - -</Deployment:PackageConfiguration> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/Deployment.xsd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/Deployment.xsd deleted file mode 100644 index c8a6399730b..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/Deployment.xsd +++ /dev/null @@ -1,776 +0,0 @@ -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:Deployment="http://www.omg.org/Deployment" - targetNamespace="http://www.omg.org/Deployment"> - - <xsd:import namespace="http://www.omg.org/XMI" schemaLocation="XMI.xsd" /> - - - <xsd:complexType name="Any"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Any" type="Deployment:Any"/> - <xsd:complexType name="DataType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="kind" type="Deployment:TCKind"/> - <xsd:element name="enum" type="Deployment:EnumType"/> - <xsd:element name="objref" type="Deployment:ObjrefType"/> - <xsd:element name="boundedString" type="Deployment:BoundedStringType"/> - <xsd:element name="fixed" type="Deployment:FixedType"/> - <xsd:element name="array" type="Deployment:ArrayType"/> - <xsd:element name="sequence" type="Deployment:SequenceType"/> - <xsd:element name="alias" type="Deployment:AliasType"/> - <xsd:element name="struct" type="Deployment:StructType"/> - <xsd:element name="value" type="Deployment:ValueType"/> - <xsd:element name="union" type="Deployment:UnionType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataType" type="Deployment:DataType"/> - <xsd:complexType name="DataValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="short" type="xsd:short"/> - <xsd:element name="long" type="xsd:int"/> - <xsd:element name="ushort" type="xsd:unsignedShort"/> - <xsd:element name="ulong" type="xsd:unsignedInt"/> - <xsd:element name="float" type="xsd:float"/> - <xsd:element name="double" type="xsd:double"/> - <xsd:element name="boolean" type="xsd:boolean"/> - <xsd:element name="octet" type="xsd:unsignedByte"/> - <xsd:element name="opaque" type="xsd:base64Binary"/> - <xsd:element name="objref" type="xsd:string"/> - <xsd:element name="enum" type="xsd:string"/> - <xsd:element name="string" type="xsd:string"/> - <xsd:element name="longlong" type="xsd:long"/> - <xsd:element name="ulonglong" type="xsd:unsignedLong"/> - <xsd:element name="longdouble" type="xsd:double"/> - <xsd:element name="fixed" type="xsd:string"/> - <xsd:element name="any" type="Deployment:Any"/> - <xsd:element name="typecode" type="Deployment:DataType"/> - <xsd:element name="element" type="Deployment:DataValue"/> - <xsd:element name="discriminator" type="Deployment:DataValue"/> - <xsd:element name="value" type="Deployment:DataValue"/> - <xsd:element name="boxedValue" type="Deployment:DataValue"/> - <xsd:element name="member" type="Deployment:NamedValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DataValue" type="Deployment:DataValue"/> - - - <xsd:complexType name="EnumType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="EnumType" type="Deployment:EnumType"/> - <xsd:complexType name="ObjrefType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - - - <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/> - <xsd:complexType name="BoundedStringType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="BoundedStringType" type="Deployment:BoundedStringType"/> - <xsd:complexType name="FixedType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="digits" type="xsd:string"/> - <xsd:element name="scale" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="FixedType" type="Deployment:FixedType"/> - <xsd:complexType name="ArrayType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="length" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArrayType" type="Deployment:ArrayType"/> - <xsd:complexType name="SequenceType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SequenceType" type="Deployment:SequenceType"/> - <xsd:complexType name="AliasType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AliasType" type="Deployment:AliasType"/> - <xsd:complexType name="StructType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="Deployment:StructMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructType" type="Deployment:StructType"/> - <xsd:complexType name="StructMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="StructMemberType" type="Deployment:StructMemberType"/> - <xsd:complexType name="ValueType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="modifier" type="xsd:string"/> - <xsd:element name="baseType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:ValueMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueType" type="Deployment:ValueType"/> - <xsd:complexType name="ValueMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="visibility" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ValueMemberType" type="Deployment:ValueMemberType"/> - <xsd:complexType name="UnionType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="default" type="Deployment:UnionMemberType"/> - <xsd:element name="discriminatorType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:UnionMemberType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionType" type="Deployment:UnionType"/> - <xsd:complexType name="UnionMemberType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="label" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="UnionMemberType" type="Deployment:UnionMemberType"/> - <xsd:complexType name="NamedValue"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:DataValue"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedValue" type="Deployment:NamedValue"/> - <xsd:complexType name="Bridge"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connect" type="Deployment:Interconnect"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Bridge" type="Deployment:Bridge"/> - <xsd:complexType name="Interconnect"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Bridge"/> - <xsd:element name="connect" type="Deployment:Node"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Interconnect" type="Deployment:Interconnect"/> - <xsd:complexType name="Node"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="connection" type="Deployment:Interconnect"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="resource" type="Deployment:Resource"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Node" type="Deployment:Node"/> - <xsd:complexType name="Resource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Resource" type="Deployment:Resource"/> - <xsd:complexType name="SharedResource"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SharedResource" type="Deployment:SharedResource"/> - <xsd:complexType name="Domain"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource"/> - <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="interconnect" type="Deployment:Interconnect"/> - <xsd:element name="bridge" type="Deployment:Bridge"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Domain" type="Deployment:Domain"/> - <xsd:complexType name="PlanPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanPropertyMapping" type="Deployment:PlanPropertyMapping"/> - <xsd:complexType name="PlanSubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPropertyReference" type="Deployment:PlanSubcomponentPropertyReference"/> - <xsd:complexType name="PlanSubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanSubcomponentPortEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:complexType name="PlanConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PlanConnectionDescription" type="Deployment:PlanConnectionDescription"/> - <xsd:complexType name="InstanceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceDeploymentDescription" type="Deployment:InstanceDeploymentDescription"/> - <xsd:complexType name="MonolithicDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicDeploymentDescription" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:complexType name="ArtifactDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="source" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ArtifactDeploymentDescription" type="Deployment:ArtifactDeploymentDescription"/> - - - <xsd:complexType name="DeploymentPlan"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/> - <xsd:element name="connection" type="Deployment:PlanConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="DeploymentPlan" type="Deployment:DeploymentPlan"/> - - - <xsd:complexType name="ResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ResourceDeploymentDescription" type="Deployment:ResourceDeploymentDescription"/> - <xsd:complexType name="InstanceResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="InstanceResourceDeploymentDescription" type="Deployment:InstanceResourceDeploymentDescription"/> - <xsd:complexType name="ConnectionResourceDeploymentDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="targetName" type="xsd:string"/> - <xsd:element name="requirementName" type="xsd:string"/> - <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ConnectionResourceDeploymentDescription" type="Deployment:ConnectionResourceDeploymentDescription"/> - <xsd:complexType name="Capability"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Capability" type="Deployment:Capability"/> - <xsd:complexType name="ComponentPropertyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPropertyDescription" type="Deployment:ComponentPropertyDescription"/> - <xsd:complexType name="ComponentPortDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="exclusiveProvider" type="xsd:string"/> - <xsd:element name="exclusiveUser" type="xsd:string"/> - <xsd:element name="optional" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPortDescription" type="Deployment:ComponentPortDescription"/> - <xsd:complexType name="ComponentInterfaceDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="idlFile" type="xsd:string"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="port" type="Deployment:ComponentPortDescription"/> - <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/> - <xsd:complexType name="ImplementationArtifactDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="location" type="xsd:string"/> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationArtifactDescription" type="Deployment:ImplementationArtifactDescription"/> - <xsd:complexType name="MonolithicImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="execParameter" type="Deployment:Property"/> - <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="MonolithicImplementationDescription" type="Deployment:MonolithicImplementationDescription"/> - <xsd:complexType name="AssemblyPropertyMapping"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyPropertyMapping" type="Deployment:AssemblyPropertyMapping"/> - <xsd:complexType name="SubcomponentPropertyReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPropertyReference" type="Deployment:SubcomponentPropertyReference"/> - <xsd:complexType name="SubcomponentPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentPortEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:complexType name="AssemblyConnectionDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/> - <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="AssemblyConnectionDescription" type="Deployment:AssemblyConnectionDescription"/> - <xsd:complexType name="SubcomponentInstantiationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SubcomponentInstantiationDescription" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:complexType name="ComponentAssemblyDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> - <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentAssemblyDescription" type="Deployment:ComponentAssemblyDescription"/> - <xsd:complexType name="ComponentImplementationDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/> - <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="capability" type="Deployment:Capability"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentImplementationDescription" type="Deployment:ComponentImplementationDescription"/> - <xsd:complexType name="ComponentPackageReference"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredUUID" type="xsd:string"/> - <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageReference" type="Deployment:ComponentPackageReference"/> - <xsd:complexType name="ComponentPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:element name="infoProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentPackageDescription" type="Deployment:ComponentPackageDescription"/> - <xsd:complexType name="PackageConfiguration"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/> - <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement"/> - <xsd:element name="configProperty" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackageConfiguration" type="Deployment:PackageConfiguration"/> - <xsd:complexType name="PackagedComponentImplementation"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="PackagedComponentImplementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:complexType name="NamedImplementationArtifact"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="NamedImplementationArtifact" type="Deployment:NamedImplementationArtifact"/> - <xsd:complexType name="ImplementationRequirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="resourcePort" type="xsd:string"/> - <xsd:element name="componentPort" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationRequirement" type="Deployment:ImplementationRequirement"/> - <xsd:complexType name="RequirementSatisfier"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="RequirementSatisfier" type="Deployment:RequirementSatisfier"/> - <xsd:complexType name="SatisfierProperty"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="SatisfierProperty" type="Deployment:SatisfierProperty"/> - <xsd:complexType name="Requirement"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Requirement" type="Deployment:Requirement"/> - <xsd:complexType name="Property"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="Property" type="Deployment:Property"/> - <xsd:complexType name="ExternalReferenceEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="location" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/> - <xsd:complexType name="ComponentExternalPortEndpoint"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="portName" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/> - <xsd:complexType name="ImplementationDependency"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="requiredType" type="xsd:string"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/> - <xsd:complexType name="TopLevelPackageDescription"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="package" type="Deployment:PackageConfiguration"/> - </xsd:choice> - <xsd:attribute ref="xmi:id" use="optional"/> - <xsd:attributeGroup ref="xmi:ObjectAttribs"/> - </xsd:complexType> - <xsd:element name="TopLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/> - <xsd:simpleType name="TCKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="tk_null"/> - <xsd:enumeration value="tk_void"/> - <xsd:enumeration value="tk_short"/> - <xsd:enumeration value="tk_long"/> - <xsd:enumeration value="tk_ushort"/> - <xsd:enumeration value="tk_ulong"/> - <xsd:enumeration value="tk_float"/> - <xsd:enumeration value="tk_double"/> - <xsd:enumeration value="tk_boolean"/> - <xsd:enumeration value="tk_char"/> - <xsd:enumeration value="tk_octet"/> - <xsd:enumeration value="tk_any"/> - <xsd:enumeration value="tk_TypeCode"/> - <xsd:enumeration value="tk_Principal"/> - <xsd:enumeration value="tk_objref"/> - <xsd:enumeration value="tk_struct"/> - <xsd:enumeration value="tk_union"/> - <xsd:enumeration value="tk_enum"/> - <xsd:enumeration value="tk_string"/> - <xsd:enumeration value="tk_sequence"/> - <xsd:enumeration value="tk_array"/> - <xsd:enumeration value="tk_alias"/> - <xsd:enumeration value="tk_except"/> - <xsd:enumeration value="tk_longlong"/> - <xsd:enumeration value="tk_ulonglong"/> - <xsd:enumeration value="tk_longdouble"/> - <xsd:enumeration value="tk_wchar"/> - <xsd:enumeration value="tk_wstring"/> - <xsd:enumeration value="tk_wfixed"/> - <xsd:enumeration value="tk_value"/> - <xsd:enumeration value="tk_value_box"/> - <xsd:enumeration value="tk_native"/> - <xsd:enumeration value="tk_abstract_interface"/> - <xsd:enumeration value="tk_local_interface"/> - <xsd:enumeration value="tk_component"/> - <xsd:enumeration value="tk_home"/> - <xsd:enumeration value="tk_event"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ResourceUsageKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="None"/> - <xsd:enumeration value="InstanceUsesResource"/> - <xsd:enumeration value="ResourceUsesInstance"/> - <xsd:enumeration value="PortUsesResource"/> - <xsd:enumeration value="ResourceUsesPort"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CCMComponentPortKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Facet"/> - <xsd:enumeration value="SimplexReceptacle"/> - <xsd:enumeration value="MultiplexReceptacle"/> - <xsd:enumeration value="EventEmitter"/> - <xsd:enumeration value="EventPublisher"/> - <xsd:enumeration value="EventConsumer"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SatisfierPropertyKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Quantity"/> - <xsd:enumeration value="Capacity"/> - <xsd:enumeration value="Minimum"/> - <xsd:enumeration value="Maximum"/> - <xsd:enumeration value="Attribute"/> - <xsd:enumeration value="Selection"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/DeploymentPlan.cdp b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/DeploymentPlan.cdp deleted file mode 100644 index 4ff7a8d5a18..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/DeploymentPlan.cdp +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <instance> - <name>HumanMachineInterface</name> - <node>WindowsXP</node> - </instance> - - <instance> - <name>PalletConveyorManager</name> - <node>WindowsXP</node> - </instance> - - <instance> - <name>ManagementWorkInstructions</name> - <node>WindowsXP</node> - </instance> - - <instance> - <name>RobotManager</name> - <node>RedHatLinux</node> - </instance> - - <instance> - <name>WatchSettingManager</name> - <node>RedHatLinux</node> - </instance> - -</Deployment:DeploymentPlan> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.ccd deleted file mode 100644 index bab76ec6aa4..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.ccd +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>12BEDDC8-1E80-4D98-892D-A74701F1ED81</UUID> - - <port> - <name>WorkDisplayUpdate</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>EventConsumer</kind> - </port> - - <port> - <name>Controller</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>Facet</kind> - </port> - - <port> - <name>HumanResponse</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cid b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cid deleted file mode 100644 index 6f0c5d26310..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>20264D1E-DBA1-497E-9DE8-37DE3FA69D14</UUID> - - <implements href="HumanMachineInterface.ccd"/> - - <monolithicImpl> - <primaryArtifact> - <name>HumanMachineInterface_exec</name> - <referencedArtifact href="HumanMachineInterface_exec.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>HumanMachineInterface_stub</name> - <referencedArtifact href="HumanMachineInterface_stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>HumanMachineInterface_svnt</name> - <referencedArtifact href="HumanMachineInterface_svnt.iad"/> - </primaryArtifact> - </monolithicImpl> - - <ConfigProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>HMI.ior</string> - </value> - </value> - </ConfigProperty> - -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cpd deleted file mode 100644 index 91fbfcdf975..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>3FBA1506-1F92-4D8F-B1EF-8AEA5A9BD1D1</UUID> - - <realizes href="HumanMachineInterface.ccd"/> - - <implementation> - <name>HumanMachineInterface</name> - <referencedImplementation href="HumanMachineInterface.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_exec.iad deleted file mode 100644 index fd725769af8..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_exec.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>HumanMachineInterface Executor</label> - - <UUID>AA6126E4-3CBC-4734-B010-2C59B6BF7CD0</UUID> - - <location>HumanMachineInterface_exec</location> - - <dependsOn> - <name>HumanMachineInterface_stub</name> - <referencedArtifact href="HumanMachineInterface_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createHumanMachineInterfaceHome_Impl</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_stub.iad deleted file mode 100644 index 67fe7c500ba..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_stub.iad +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>HumanMachineInterface Stub library</label> - - <UUID>479EBAE2-74D4-4812-AB75-8A74A0E07588</UUID> - - <location>HumanMachineInterface_stub</location> - - <dependsOn> - <name>CIAO</name> - <referencedArtifact href="CIAO.iad"/> - </dependsOn> - - <dependsOn> - <name>ACE</name> - <referencedArtifact href="ACE.iad"/> - </dependsOn> - - <dependsOn> - <name>TAO</name> - <referencedArtifact href="TAO.iad"/> - </dependsOn> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_svnt.iad deleted file mode 100644 index 95773ba37cc..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_svnt.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>HumanMachineInterface Servant Library</label> - - <UUID>F5C8EDFC-6C08-464B-8931-0278C4648817</UUID> - - <location>HumanMachineInterface_svnt</location> - - <dependsOn> - <name>HumanMachineInterface_stub</name> - <referencedArtifact href="HumanMachineInterface_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createHumanMachineInterfaceHome_Servant</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.ccd deleted file mode 100644 index 436bc3613fb..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.ccd +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>49DEB57F-644E-49E4-A0C8-0708FD9BA8AB</UUID> - - <port> - <name>sendWorkOrder</name> - <exclusiveProvider>true</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>EventEmitter</kind> - </port> - - <port> - <name>ProductionReport</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>EventConsumer</kind> - </port> - - <port> - <name>Controller</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cid b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cid deleted file mode 100644 index cf17404525b..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>F2F51EEF-D9C7-413B-A87C-E96E4753BF05</UUID> - - <implements href="ManagementWorkInstructions.ccd"/> - - <monolithicImpl> - <primaryArtifact> - <name>ManagementWorkInstructions_exec</name> - <referencedArtifact href="ManagementWorkInstructions_exec.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>ManagementWorkInstructions_stub</name> - <referencedArtifact href="ManagementWorkInstructions_stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>ManagementWorkInstructions_svnt</name> - <referencedArtifact href="ManagementWorkInstructions_svnt.iad"/> - </primaryArtifact> - </monolithicImpl> - - <ConfigProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>MWI.ior</string> - </value> - </value> - </ConfigProperty> - -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cpd deleted file mode 100644 index 6c26ef8b3d3..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>283BE3F8-2AA4-429C-B669-1626FE685B1D</UUID> - - <realizes href="ManagementWorkInstructions.ccd"/> - - <implementation> - <name>ManagementWorkInstructions</name> - <referencedImplementation href="ManagementWorkInstructions.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_exec.iad deleted file mode 100644 index d1a2f7d3722..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_exec.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>ManagementWorkInstructions Executor</label> - - <UUID>06E94B78-D8A6-4EB2-9362-1C06C025BE3E</UUID> - - <location>ManagementWorkInstructions_exec</location> - - <dependsOn> - <name>ManagementWorkInstructions_stub</name> - <referencedArtifact href="ManagementWorkInstructions_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createManagementWorkInstructionsHome_Impl</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_stub.iad deleted file mode 100644 index ea57cd4af6e..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_stub.iad +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>ManagementWorkInstructions Stub library</label> - - <UUID>EC0668FB-EAF9-4313-8A98-069C0839D5AB</UUID> - - <location>ManagementWorkInstructions_stub</location> - - <dependsOn> - <name>CIAO</name> - <referencedArtifact href="CIAO.iad"/> - </dependsOn> - - <dependsOn> - <name>TAO</name> - <referencedArtifact href="TAO.iad"/> - </dependsOn> - - <dependsOn> - <name>ACE</name> - <referencedArtifact href="ACE.iad"/> - </dependsOn> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_svnt.iad deleted file mode 100644 index e11ab5d15e4..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_svnt.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>ManagementWorkInstructions Servant Library</label> - - <UUID>C40F8DC0-9EE9-4008-9C1D-320D028D78E0</UUID> - - <location>ManagementWorkInstructions_svnt</location> - - <dependsOn> - <name>ManagementWorkInstructions_stub</name> - <referencedArtifact href="ManagementWorkInstructions_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createManagementWorkInstructionsHome_Servant</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.ccd deleted file mode 100644 index 31abeabb2a5..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.ccd +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>76AB16A9-1794-43DD-8DF2-106381B94F6C</UUID> - - <port> - <name>PalletStatus</name> - <exclusiveProvider>true</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>EventEmitter</kind> - </port> - - <port> - <name>PalletRequests</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>EventConsumer</kind> - </port> - - <port> - <name>Controller</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cid b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cid deleted file mode 100644 index 83425f466e0..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>E642FD17-3967-4054-8190-8C7C4624C793</UUID> - - <implements href="PalletConveyorManager.ccd"/> - - <monolithicImpl> - <primaryArtifact> - <name>PalletConveyorManager_stub</name> - <referencedArtifact href="PalletConveyorManager_stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>PalletConveyorManager_exec</name> - <referencedArtifact href="PalletConveyorManager_exec.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>PalletConveyorManager_svnt</name> - <referencedArtifact href="PalletConveyorManager_svnt.iad"/> - </primaryArtifact> - </monolithicImpl> - - <ConfigProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>PCM.ior</string> - </value> - </value> - </ConfigProperty> - -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cpd deleted file mode 100644 index d3e796addea..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>39B68DEB-DACF-4380-8AF9-855BBA92C3CD</UUID> - - <realizes href="PalletConveyorManager.ccd"/> - - <implementation> - <name>PalletConveyorManager</name> - <referencedImplementation href="PalletConveyorManager.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_exec.iad deleted file mode 100644 index 175f1a233b4..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_exec.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>PalletConveyorManager Executor</label> - - <UUID>E3E0D7AC-3EE6-427C-92CC-F544E14E896C</UUID> - - <location>PalletConveyorManager_exec</location> - - <dependsOn> - <name>PalletConveyorManager_stub</name> - <referencedArtifact href="PalletConveyorManager_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createPalletConveyorManagerHome_Impl</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_stub.iad deleted file mode 100644 index 60c9bd835c9..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_stub.iad +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>PalletConveyorManager Stub library</label> - - <UUID>DD0D8B7F-C092-4FA8-9B5D-91849DA9832B</UUID> - - <location>PalletConveyorManager_stub</location> - - <dependsOn> - <name>CIAO</name> - <referencedArtifact href="CIAO.iad"/> - </dependsOn> - - <dependsOn> - <name>TAO</name> - <referencedArtifact href="TAO.iad"/> - </dependsOn> - - <dependsOn> - <name>ACE</name> - <referencedArtifact href="ACE.iad"/> - </dependsOn> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_svnt.iad deleted file mode 100644 index 2eab88d7f96..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_svnt.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>PalletConveyorManager Servant Library</label> - - <UUID>51B0774B-8C94-45A1-B771-995B531D0E55</UUID> - - <location>PalletConveyorManager_svnt</location> - - <dependsOn> - <name>PalletConveyorManager_stub</name> - <referencedArtifact href="PalletConveyorManager_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createPalletConveyorManagerHome_Servant</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/README.html b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/README.html deleted file mode 100644 index 53af281b31c..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/README.html +++ /dev/null @@ -1,93 +0,0 @@ -<HTML> -<!-- $Id$ --> - -<BODY> - -This document describes how to compile/run the Robot Assembly with the new DnC -implementation. - -<H3> Installing </H3> - -<UL> - <LI> Make sure you have the latest DnC code by running - <code> [in ACE_wrappers/TAO/CIAO/DnC directory] cvs up </code> - </LI> - - <LI> - Get the latest cidl compiler (if you did not compile from source) from - (precompiled binaries for linux, windows, darwin, and solaris are provided): - <A href="http://www.dre.vanderbilt.edu/~boris/cidlc/binary/"> - http://www.dre.vanderbilt.edu/cidlc/binary/ - </A> - - Copy the file into the <code> ACE_wrappers/TAO/CIAO/bin </code> directory. - </LI> - - <LI> - Generate the make/project files for the DnC directory by using <code> - ACE_wrappers/bin/mwc.pl </code> script: - <UL> - <LI> <em> linux: </em> <code> [in $CIAO_ROOT/DnC] mwc.pl </code> </LI> - <LI> <em> windows: </em> <code> [in %CIAO_ROOT%/DnC] mwc.pl </code> </LI> - </UL> - </LI> - - <LI> Compile the DnC code with the generated solution/make files. </LI> - - <LI> - Generate the project/make files for the <em> RobotAssembly </em> - directory: - <code> [in RobotAssembly root folder] mwc.pl </code> - </LI> - - <LI> Compile the generated solution/make files </LI> -</UL> - -<H3> Running the test </H3> - -<UL> - <LI> - Create a new directory <code> [in RobotAssembly root folder] test </code> - (or any other name you want) and change the working directory to that. - </LI> - - <LI> Download the files into the newly created directory: - <UL> - <LI> <A HREF= - "http://www.dre.vanderbilt.edu/~turkaye/dnc/RobotAssembly/NodeDaemon.txt"> - http://www.dre.vanderbilt.edu/~turkaye/dnc/RobotAssembly/NodeDaemon.txt - </A> [and rename that file to NodeDaemon.pl] </LI> - <LI> <A HREF= - "http://www.dre.vanderbilt.edu/~turkaye/dnc/RobotAssembly/deployment.dat"> - http://www.dre.vanderbilt.edu/~turkaye/dnc/RobotAssembly/deployment.dat - </A> </LI> - </UL> - </LI> - - <LI> Start daemons by running <code> NodeDaemon.pl </code> - - <LI> Start the execution manager: - <code> - ACE_wrappers/TAO/CIAO/DnC/ExecutionManager/Execution_Manager - -o EM.ior - -i deployment.dat - </code> - </LI> - - <LI> Start the executor: - Note: You should give the correct path of your ACE_wrappers directory. - <BR/> - <code> - ACE_wrappers/TAO/CIAO/DnC/RepositoryManager/executor - -p /ACE_wrappers/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/package.tpd - -d -/ACE_wrappers/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/DeploymentPlan.cdp - -k file://EM.ior - </code> - - <BR/> - - </LI> -</UL> - -</BODY> </HTML> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cid b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cid deleted file mode 100644 index b59f5e4406e..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cid +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>AACECC3F-A903-4224-A090-38F8A6988F86</UUID> - - <assemblyImpl> - <instance xmi:id="HumanMachineInterface_483EBD69-2BDB-4A6B-8713-26A66BE8912B"> - <name>HumanMachineInterface</name> - <package href="HumanMachineInterface.cpd"/> - </instance> - <instance xmi:id="ManagementWorkInstructions_E451C313-14C2-4B8A-8F10-B4A4696DF82A"> - <name>ManagementWorkInstructions</name> - <package href="ManagementWorkInstructions.cpd"/> - </instance> - <instance xmi:id="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"> - <name>WatchSettingManager</name> - <package href="WatchSettingManager.cpd"/> - </instance> - <instance xmi:id="PalletConveyorManager_EEE36369-0E67-479E-9B4C-3B3660899F7A"> - <name>PalletConveyorManager</name> - <package href="PalletConveyorManager.cpd"/> - </instance> - <instance xmi:id="RobotManager_3F7E6341-D6D3-4048-88BB-655597DA0449"> - <name>RobotManager</name> - <package href="RobotManager.cpd"/> - </instance> - <connection> - <name>HumanResponse_DisplayResponse</name> - <internalEndpoint> - <portName>DisplayResponse</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - <internalEndpoint> - <portName>HumanResponse</portName> - <instance xmi:idref="HumanMachineInterface_483EBD69-2BDB-4A6B-8713-26A66BE8912B"/> - </internalEndpoint> - </connection> - <connection> - <name>recvWorkOrder_sendWorkOrder</name> - <internalEndpoint> - <portName>sendWorkOrder</portName> - <instance xmi:idref="ManagementWorkInstructions_E451C313-14C2-4B8A-8F10-B4A4696DF82A"/> - </internalEndpoint> - <internalEndpoint> - <portName>recvWorkOrder</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - </connection> - <connection> - <name>ProductionReport_ProductionReport</name> - <internalEndpoint> - <portName>ProductionReport</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - <internalEndpoint> - <portName>ProductionReport</portName> - <instance xmi:idref="ManagementWorkInstructions_E451C313-14C2-4B8A-8F10-B4A4696DF82A"/> - </internalEndpoint> - </connection> - <connection> - <name>PalletRequests_MovePallet</name> - <internalEndpoint> - <portName>MovePallet</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - <internalEndpoint> - <portName>PalletRequests</portName> - <instance xmi:idref="PalletConveyorManager_EEE36369-0E67-479E-9B4C-3B3660899F7A"/> - </internalEndpoint> - </connection> - <connection> - <name>PalletStatus_PalletStatus</name> - <internalEndpoint> - <portName>PalletStatus</portName> - <instance xmi:idref="PalletConveyorManager_EEE36369-0E67-479E-9B4C-3B3660899F7A"/> - </internalEndpoint> - <internalEndpoint> - <portName>PalletStatus</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - </connection> - <connection> - <name>ProcessingStatus_ProcessingStatus</name> - <internalEndpoint> - <portName>ProcessingStatus</portName> - <instance xmi:idref="RobotManager_3F7E6341-D6D3-4048-88BB-655597DA0449"/> - </internalEndpoint> - <internalEndpoint> - <portName>ProcessingStatus</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - </connection> - <connection> - <name>ProcessPalletCommands_ProductionControl</name> - <internalEndpoint> - <portName>ProductionControl</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - <internalEndpoint> - <portName>ProcessPalletCommands</portName> - <instance xmi:idref="RobotManager_3F7E6341-D6D3-4048-88BB-655597DA0449"/> - </internalEndpoint> - </connection> - <connection> - <name>WorkDisplayUpdate_Display</name> - <internalEndpoint> - <portName>Display</portName> - <instance xmi:idref="WatchSettingManager_137DADE0-EB93-4D3F-9D7F-E74C8F50EAA0"/> - </internalEndpoint> - <internalEndpoint> - <portName>WorkDisplayUpdate</portName> - <instance xmi:idref="HumanMachineInterface_483EBD69-2BDB-4A6B-8713-26A66BE8912B"/> - </internalEndpoint> - </connection> - </assemblyImpl> - -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cpd deleted file mode 100644 index 8b773313f8e..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cpd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>80420C83-2B55-40C5-8BBD-F0DAD6C7DA86</UUID> - - <implementation> - <name>RobotAssembly</name> - <referencedImplementation href="RobotAssembly.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.ccd deleted file mode 100644 index ba032b0cdbc..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.ccd +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>D9515E36-592C-41E8-8340-E293511BB28E</UUID> - - <port> - <name>ProcessingStatus</name> - <exclusiveProvider>true</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>EventEmitter</kind> - </port> - - <port> - <name>ProcessPalletCommands</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>EventConsumer</kind> - </port> - - <port> - <name>Controller</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cid b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cid deleted file mode 100644 index 91243765382..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>438E0207-5E97-44F4-8543-BAF25B3FA69C</UUID> - - <implements href="RobotManager.ccd"/> - - <monolithicImpl> - <primaryArtifact> - <name>RobotManager_exec</name> - <referencedArtifact href="RobotManager_exec.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>RobotManager_stub</name> - <referencedArtifact href="RobotManager_stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>RobotManager_svnt</name> - <referencedArtifact href="RobotManager_svnt.iad"/> - </primaryArtifact> - </monolithicImpl> - - <ConfigProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>RM.ior</string> - </value> - </value> - </ConfigProperty> - -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cpd deleted file mode 100644 index e5881513ab1..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>9003535E-0F88-45DC-877F-A0CFDFEE3D46</UUID> - - <realizes href="RobotManager.ccd"/> - - <implementation> - <name>RobotManager</name> - <referencedImplementation href="RobotManager.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_exec.iad deleted file mode 100644 index fb281506ff0..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_exec.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>Robot Manager Executor</label> - - <UUID>FB5FA197-84E9-4959-A0F7-9A664DF850C5</UUID> - - <location>RobotManager_exec</location> - - <dependsOn> - <name>RobotManager_stub</name> - <referencedArtifact href="RobotManager_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createRobotManagerHome_Impl</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_stub.iad deleted file mode 100644 index 09b06ad3ada..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_stub.iad +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>RobotManager Stub library</label> - - <UUID>EC871840-A1F9-40A7-AC70-4FE9D2C2067A</UUID> - - <location>RobotManager_stub</location> - - <dependsOn> - <name>CIAO</name> - <referencedArtifact href="CIAO.iad"/> - </dependsOn> - - <dependsOn> - <name>TAO</name> - <referencedArtifact href="TAO.iad"/> - </dependsOn> - - <dependsOn> - <name>ACE</name> - <referencedArtifact href="ACE.iad"/> - </dependsOn> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_svnt.iad deleted file mode 100644 index c812fdf5d24..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/RobotManager_svnt.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>RobotManager Servant Library</label> - - <UUID>647C62E6-7926-4C5C-885A-BFED4C8C9BC2</UUID> - - <location>RobotManager_svnt</location> - - <dependsOn> - <name>RobotManager_stub</name> - <referencedArtifact href="RobotManager_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createRobotManagerHome_Servant</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/TAO.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/TAO.iad deleted file mode 100644 index 8c57693fa41..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/TAO.iad +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>TAO Library</label> - - <UUID>0E42E5B3-B2FD-4B8E-88AA-74694C6B0AE2</UUID> - - <location>libTAO</location> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.ccd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.ccd deleted file mode 100644 index 66efdc8f7ff..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.ccd +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>1A0D4104-3D7A-44B9-9C47-F958CD869715</UUID> - - <port> - <name>Display</name> - <exclusiveProvider>true</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>EventEmitter</kind> - </port> - - <port> - <name>ProductionControl</name> - <exclusiveProvider>true</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>EventEmitter</kind> - </port> - - <port> - <name>MovePallet</name> - <exclusiveProvider>true</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>EventEmitter</kind> - </port> - - <port> - <name>ProductionReport</name> - <exclusiveProvider>true</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>EventEmitter</kind> - </port> - - <port> - <name>ProcessingStatus</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>EventConsumer</kind> - </port> - - <port> - <name>PalletStatus</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>EventConsumer</kind> - </port> - - <port> - <name>recvWorkOrder</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <kind>EventConsumer</kind> - </port> - - <port> - <name>DisplayResponse</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cid b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cid deleted file mode 100644 index 848f83766f1..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>B983E150-B081-4876-9DD6-36C27C6B1D5D</UUID> - - <implements href="WatchSettingManager.ccd"/> - - <monolithicImpl> - <primaryArtifact> - <name>WatchSettingManager_exec</name> - <referencedArtifact href="WatchSettingManager_exec.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>WatchSettingManager_stub</name> - <referencedArtifact href="WatchSettingManager_stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>WatchSettingManager_svnt</name> - <referencedArtifact href="WatchSettingManager_svnt.iad"/> - </primaryArtifact> - </monolithicImpl> - - <ConfigProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>WSM.ior</string> - </value> - </value> - </ConfigProperty> - -</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cpd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cpd deleted file mode 100644 index 21e0b9d00da..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>94134F28-B165-41D6-8D94-E038115B19D4</UUID> - - <realizes href="WatchSettingManager.ccd"/> - - <implementation> - <name>WatchSettingManager</name> - <referencedImplementation href="WatchSettingManager.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_exec.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_exec.iad deleted file mode 100644 index 54baa312bc2..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_exec.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>WatchSettingManager Executor</label> - - <UUID>29A1EB52-096C-4DD8-A72F-C14BFBF563D0</UUID> - - <location>WatchSettingManager_exec</location> - - <dependsOn> - <name>WatchSettingManager_stub</name> - <referencedArtifact href="WatchSettingManager_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createWatchSettingManagerHome_Impl</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_stub.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_stub.iad deleted file mode 100644 index 66b7f6f7378..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_stub.iad +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>WatchSettingManager Stub library</label> - - <UUID>4B479C30-AE1A-4B4B-90B0-966276935C3D</UUID> - - <location>WatchSettingManager_stub</location> - - <dependsOn> - <name>CIAO</name> - <referencedArtifact href="CIAO.iad"/> - </dependsOn> - - <dependsOn> - <name>TAO</name> - <referencedArtifact href="TAO.iad"/> - </dependsOn> - - <dependsOn> - <name>ACE</name> - <referencedArtifact href="ACE.iad"/> - </dependsOn> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_svnt.iad b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_svnt.iad deleted file mode 100644 index 0dbe2f77524..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_svnt.iad +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <label>WatchSettingManager Servant Library</label> - - <UUID>5115AEA9-CC92-4C00-A1CC-13608D25C63A</UUID> - - <location>WatchSettingManager_svnt</location> - - <dependsOn> - <name>WatchSettingManager_stub</name> - <referencedArtifact href="WatchSettingManager_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>createWatchSettingManagerHome_Servant</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/XMI.xsd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/XMI.xsd deleted file mode 100644 index f4adac91934..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/XMI.xsd +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'> - <xsd:attribute name="id" type="xsd:ID" /> - <xsd:attributeGroup name="IdentityAttribs"> - <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="LinkAttribs"> - <xsd:attribute name="href" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="ObjectAttribs"> - <xsd:attributeGroup ref="xmi:IdentityAttribs" /> - <xsd:attributeGroup ref="xmi:LinkAttribs" /> - <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" /> - </xsd:attributeGroup> - <xsd:complexType name="Extension"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="lax" /> - </xsd:choice> - <xsd:attribute ref="xmi:id" /> - <xsd:attributeGroup ref="xmi:ObjectAttribs" /> - <xsd:attribute name="extender" type="xsd:string" use="optional" /> - <xsd:attribute name="extenderID" type="xsd:string" use="optional" /> - </xsd:complexType> - <xsd:element name="Extension" type="xmi:Extension" /> - <xsd:complexType name="Any"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="skip" /> - </xsd:choice> - <xsd:anyAttribute processContents="skip" /> - </xsd:complexType> -</xsd:schema> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/package.tpd b/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/package.tpd deleted file mode 100644 index 394ec2815fd..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/RobotAssembly/package.tpd +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:TopLevelPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <package href="DefaultConfiguration.pcd"/> - -</Deployment:TopLevelPackageDescription> diff --git a/TAO/CIAO/DnC/tests/Config_Handlers/handler_test.mpb b/TAO/CIAO/DnC/tests/Config_Handlers/handler_test.mpb deleted file mode 100644 index 167efa08289..00000000000 --- a/TAO/CIAO/DnC/tests/Config_Handlers/handler_test.mpb +++ /dev/null @@ -1,15 +0,0 @@ -//$Id$ - -project : taoexe, ciao_deployment_stub { // , portableserver, typecodefactory { - requires += dnc - dynamicflags = CONFIG_HANDLER_BUILD_DLL - macros += XML_USE_PTHREADS - includes += $(XERCESCROOT)/include /usr/include $(ACE_ROOT)/TAO/CIAO/DnC - libpaths += $(XERCESCROOT)/lib /usr/lib // $(ACE_ROOT)/lib - libs += xerces-c Config_Handlers // Deployment_stub Deployment_svnt - after += Config_Handlers - - Source_Files { - Handler_Test.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest.mpc deleted file mode 100644 index 11261df6e8e..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest.mpc +++ /dev/null @@ -1,98 +0,0 @@ -// $Id$ - -project(NodeAppTest_RoundTrip_stub): ciao_client_dnc { - sharedname = NodeAppTest_RoundTrip_stub - - idlflags += -Wb,stub_export_macro=NODEAPPTEST_ROUNDTRIP_STUB_Export -Wb,stub_export_include=RoundTrip_stub_export.h -Wb,skel_export_macro=NODEAPPTEST_ROUNDTRIP_SVNT_Export -Wb,skel_export_include=RoundTrip_svnt_export.h - dynamicflags = NODEAPPTEST_ROUNDTRIP_STUB_BUILD_DLL - - IDL_Files { - NodeAppTest_RoundTrip.idl - } - - Source_Files { - NodeAppTest_RoundTripC.cpp - } -} - -project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc { - after += NodeAppTest_RoundTrip_stub - sharedname = NodeAppTest_RoundTrip_svnt - - libs += NodeAppTest_RoundTrip_stub - idlflags += -Wb,export_macro=NODEAPPTEST_ROUNDTRIP_SVNT_Export -Wb,export_include=RoundTrip_svnt_export.h - dynamicflags = NODEAPPTEST_ROUNDTRIP_SVNT_BUILD_DLL - - CIDL_Files { - NodeAppTest_RoundTrip.cidl - } - - IDL_Files { - NodeAppTest_RoundTripE.idl - } - - Source_Files { - NodeAppTest_RoundTripEC.cpp - NodeAppTest_RoundTripS.cpp - NodeAppTest_RoundTrip_svnt.cpp - } -} - -project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc { - after += NodeAppTest_RoundTrip_svnt - - sharedname = NodeAppTest_RoundTrip_exec - libs += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt - idlflags += -Wb,export_macro=NODEAPPTEST_ROUNDTRIP_EXEC_Export -Wb,export_include=RoundTrip_exec_export.h - dynamicflags = NODEAPPTEST_ROUNDTRIP_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RoundTrip_exec.cpp - } -} - -project (NodeAppTest_client_simple) : ciao_server_dnc { - after += NodeAppTest_RoundTrip_exec - - libs += NodeAppTest_RoundTrip_stub - exename += client_simple - - IDL_Files { - } - - Source_Files { - NodeApp_test_client_simple.cpp - } -} - -project (NodeAppTest_client) : ciao_server_dnc { - after += NodeAppTest_RoundTrip_exec - libs += NodeAppTest_RoundTrip_stub - exename += client - - - IDL_Files { - } - - Source_Files { - NodeApp_test_client.cpp - } -} - -project (NodeAppTest_client_ex) : ciao_server_dnc { - after += NodeAppTest_RoundTrip_exec - - libs += NodeAppTest_RoundTrip_stub - - exename += client_ex - - IDL_Files { - } - - Source_Files { - NodeApp_test_client_ex.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl deleted file mode 100644 index f620ec569d0..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#ifndef NODEAPPTEST_ROUNDTRIP_CIDL -#define NODEAPPTEST_ROUNDTRIP_CIDL - -#include "NodeAppTest_RoundTrip.idl" - -composition session RoundTrip_Impl -{ - - home executor RoundTripHome_Exec - { - implements NodeAppTest::NodeAppTest_RoundTripHome; - manages RoundTrip_Exec; - }; - -}; - -#endif /* NODEAPPTEST_ROUNDTRIP_CIDL */ diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl deleted file mode 100644 index e57258ea41c..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ - -//============================================================================= -/** - * @file RoundTrip.idl - * - * Definition of the Component that provides the LatencyTest interface - * - */ -//============================================================================= -#ifndef NODEAPP_ROUNDTRIP_IDL -#define NODEAPP_ROUNDTRIP_IDL - -#include <Components.idl> - -module NodeAppTest -{ - interface LatencyTest - { - long cube_long (in long param); - }; - - component NodeAppTest_RoundTrip supports LatencyTest - { - provides LatencyTest facet_1; - provides LatencyTest facet_2; - }; - - home NodeAppTest_RoundTripHome manages NodeAppTest_RoundTrip - { - }; - -}; -#endif /* NODEAPP_ROUNDTRIP_IDL */ diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp deleted file mode 100644 index dc21fa0fdfb..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp +++ /dev/null @@ -1,202 +0,0 @@ -// $Id$ - -#include "Deployment_CoreC.h" -#include "Client_init.h" -#include "NodeAppTest_RoundTripC.h" -#include "ace/Get_Opt.h" -#include <sstream> -#include <vector> -#include <stdlib.h> - -const char *ior = "file://test.ior"; -int comp_number = 4; - -int parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:n:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'n': - comp_number = atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s \n" - "-k <NodeApplication ior> \n" - "-n <The number of component instances> \n" - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - std::vector<NodeAppTest::NodeAppTest_RoundTrip_var> comp_list; - //std::vector<NodeAppTest::NodeAppTest_RoundTrip_var>::const_iterator iter; - - ACE_TRY_NEW_ENV - { - CORBA::ULong comp_num (comp_number); - ACE_DEBUG ((LM_DEBUG, "CompNum: %d\n",comp_num)); - - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CIAO::Client_init (orb.in ()); - - CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Deployment::NodeApplication_var comserv = - Deployment::NodeApplication::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (comserv.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil ServerActivator reference <%s>\n", ior), - 1); - } - - // This is what we will send out, containing all the instance info the - // container needs - Deployment::ImplementationInfos infos; - infos.length (CORBA::ULong (comp_num)); - - // This is what we will get back, a sequence of compoent object refs. - Deployment::ComponentInfos_var comp_info; - - CORBA::ULong i; - for (i = 0; i < comp_num; ++i) - { - Deployment::ImplementationInfo info; - - std::stringstream tmp; - tmp << "NodeAppTest_RoundTrip:" << i; - - // Add the names and entry points of each of the DLLs - info.component_instance_name = - CORBA::string_dup (tmp.str ().c_str ()); - info.executor_dll = CORBA::string_dup ("NodeAppTest_RoundTrip_exec"); - info.executor_entrypt = - CORBA::string_dup ("createRoundTripHome_Impl"); - info.servant_dll = - CORBA::string_dup ("NodeAppTest_RoundTrip_svnt"); - info.servant_entrypt = - CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant"); - - //Now add the info into the infos - infos[i] = info; - } - - // For debug purpose. - for (i = 0; i < comp_num; ++i) - { - Deployment::ImplementationInfo info; - - std::stringstream tmp; - tmp << "NodeAppTest_RoundTrip:" << i; - - // Add the names and entry points of each of the DLLs - ACE_DEBUG ((LM_DEBUG, - "The info I will send out: \n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n", - infos[i].component_instance_name.in (), - infos[i].executor_dll.in (), - infos[i].executor_entrypt.in (), - infos[i].servant_dll.in (), - infos[i].servant_entrypt.in () )); - } - - ACE_DEBUG ((LM_DEBUG, "Try installing Homes and Components\n")); - - // Install the NodeApplication Test components - comp_info = comserv->install (infos); - ACE_TRY_CHECK; - - // store the component refs - for (i = 0; i < comp_num; ++i) - { - comp_list.push_back (NodeAppTest::NodeAppTest_RoundTrip::_narrow - (comp_info[i].component_ref)); - ACE_TRY_CHECK; - - if (CORBA::is_nil (comp_list[i].in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil RoundTripHome reference: %s \n", - comp_info[i].component_instance_name.in ()), - 1); - } - } - - ACE_DEBUG ((LM_DEBUG, "Installation finished successfully.\n")); - - // Before we can start we have to start. - comserv->start (); - ACE_CHECK_RETURN (1); - - // Invoke Operation on the components - ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n")); - - for (i = 0; i < comp_num; ++i) - { - - CORBA::Long input = i; - - CORBA::Long output = - (comp_list[i])->cube_long (input ACE_ENV_ARG_PARAMETER); - - if (input*input*input == output) - { - ACE_DEBUG ((LM_DEBUG, - "Return values matched!! on Component: %d \n", - i)); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "Return values did not match: on Component: %d \n", - i)); - exit (1); - } - } - - ACE_DEBUG ((LM_DEBUG, "Try removing everything\n")); - comserv->remove (); - ACE_CHECK_RETURN (1); - - ACE_DEBUG ((LM_DEBUG, "Homes removed successfully\n")); - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "Test success!!\n")); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp deleted file mode 100644 index d07d4440d7b..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp +++ /dev/null @@ -1,169 +0,0 @@ -// $Id$ - -#include "ciao/Deployment_CoreC.h" -#include "ciao/Client_init.h" -#include "NodeAppTest_RoundTripC.h" -#include "ace/Get_Opt.h" - -const char *ior = "file://test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'k': - ior = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s \n" - "-k <NodeApplication ior> \n" - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CIAO::Client_init (orb.in ()); - - CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Deployment::NodeApplication_var comserv = - Deployment::NodeApplication::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (comserv.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil NodeApplication reference <%s>\n", - ior), - 1); - } - - - ACE_DEBUG ((LM_DEBUG, "Try installing Home\n")); - - Deployment::ImplementationInfo info; - - // Add the names and entry points of each of the DLLs - info.component_instance_name = "NodeAppTest_RoundTrip"; - info.executor_dll = "NodeAppTest_RoundTrip_exec"; - info.executor_entrypt = "createRoundTripHome_Impl"; - info.servant_dll = "NodeAppTest_RoundTrip_svnt"; - info.servant_entrypt = "createNodeAppTest_RoundTripHome_Servant"; - - // Install the NodeApplication Test component - ::Components::CCMHome_var home = comserv->install_home (info); - ACE_TRY_CHECK; - - // Narrow the Home to the appropriate component - NodeAppTest::NodeAppTest_RoundTripHome_var home_var = - NodeAppTest::NodeAppTest_RoundTripHome::_narrow (home.in ()); - - ACE_TRY_CHECK; - if (CORBA::is_nil (home_var.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil RoundTripHome reference\n"), - 1); - } - - // Get Component from Home - ACE_DEBUG ((LM_DEBUG, "Try obtaining RoundTrip component ref from Home\n")); - NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_comp_var = - NodeAppTest::NodeAppTest_RoundTrip::_narrow ( - home_var->create - (ACE_ENV_SINGLE_ARG_PARAMETER) - ); - ACE_TRY_CHECK; - if (CORBA::is_nil (roundtrip_comp_var.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil RoundTrip component reference\n"), - 1); - } - - ACE_TRY_CHECK; - // initialize the component - roundtrip_comp_var->ciao_postactivate (); - ACE_CHECK_RETURN (1); - - - //get the provided facets info. - Components::FacetDescriptions_var facets_info = - roundtrip_comp_var->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER) ; - ACE_TRY_CHECK; - - if ( facets_info->length () != 2 ) - { - ACE_DEBUG((LM_DEBUG, "Didn't get 2 facet back! but only %d\n", - facets_info->length ())); - return 1; - } - - // Invoke Operation on the Interface - ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n")); - - for (CORBA::ULong i = 0; i < 2; ++i ) - { - NodeAppTest::LatencyTest_var latency_var - = NodeAppTest::LatencyTest::_narrow ( (facets_info[i]->facet_ref ())); - ACE_DEBUG((LM_DEBUG, "Calling on facet %s\n", (facets_info[i]->name ()))); - - ACE_TRY_CHECK; - - if ( CORBA::is_nil (latency_var.in ()) ) - { - ACE_DEBUG((LM_DEBUG, "get nil latency ref for facet%d\n", i)); - return 1; - } - - CORBA::Long input = 1L; - CORBA::Long output = - latency_var->cube_long (input ACE_ENV_ARG_PARAMETER); - if (input == output) - ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n")); - else - { - ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n")); - exit (1); - } - } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "Test success!!\n")); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp deleted file mode 100644 index 6c497e81255..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// $Id$ - -#include "Deployment_CoreC.h" -#include "Client_init.h" -#include "NodeAppTest_RoundTripC.h" -#include "ace/Get_Opt.h" - -const char *ior = "file://test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'k': - ior = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s \n" - "-k <ComponentServer ior> \n" - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CIAO::Client_init (orb.in ()); - - CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Deployment::NodeApplication_var comserv = - Deployment::NodeApplication::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (comserv.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil ServerActivator reference <%s>\n", - ior), - 1); - } - - - ACE_DEBUG ((LM_DEBUG, "Try installing Home\n")); - - Deployment::ImplementationInfo info; - - // Add the names and entry points of each of the DLLs - info.component_instance_name = "NodeAppTest_RoundTrip"; - info.executor_dll = "NodeAppTest_RoundTrip_exec"; - info.executor_entrypt = "createRoundTripHome_Impl"; - info.servant_dll = "NodeAppTest_RoundTrip_svnt"; - info.servant_entrypt = "createNodeAppTest_RoundTripHome_Servant"; - - // Install the NodeApplication Test component - ::Components::CCMHome_var home = comserv->install_home (info); - ACE_TRY_CHECK; - - // Narrow the Home to the appropriate component - NodeAppTest::NodeAppTest_RoundTripHome_var home_var = - NodeAppTest::NodeAppTest_RoundTripHome::_narrow (home.in ()); - - ACE_TRY_CHECK; - if (CORBA::is_nil (home_var.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil RoundTripHome reference\n"), - 1); - } - - // Get Component from Home - ACE_DEBUG ((LM_DEBUG, "Try obtaining RoundTrip ref from Home\n")); - NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var = - home_var->create (ACE_ENV_SINGLE_ARG_PARAMETER); - - if (CORBA::is_nil (roundtrip_var.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil RoundTrip reference\n"), - 1); - } - - ACE_TRY_CHECK; - - // Invoke Operation on the Interface - ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n")); - CORBA::Long input = 1L; - CORBA::Long output = - roundtrip_var->cube_long (input ACE_ENV_ARG_PARAMETER); - - if (input == output) - ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n")); - else - { - ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n")); - exit (1); - } - - ACE_DEBUG ((LM_DEBUG, "Try removing home\n")); - comserv->remove_home (info.component_instance_name); - ACE_DEBUG ((LM_DEBUG, "Home removed successfully\n")); - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "Test success!!\n")); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/README b/TAO/CIAO/DnC/tests/NodeApplicationTest/README deleted file mode 100644 index ea8fc438089..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/README +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ -This directory contains the basic testing program for NodeApplication. - -client_simple: Test the basic home installation and component creation. - -client: Test the installation of several homes and components. - In this test I use the more convenient method provided - by the NodeApplication to insall multiple components. Aslo - a remove method is called to easily remove all homes and components. - -client_ex: Test the get_all_facet methods provided in the servant of the - component. diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec.cpp b/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec.cpp deleted file mode 100644 index 80f9a547255..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec.cpp +++ /dev/null @@ -1,133 +0,0 @@ -// $Id$ - -#include "RoundTrip_exec.h" -#include "CIAO_common.h" - -//-- ACE Scheduling Params -#include "ace/OS_NS_errno.h" - -//================================================================= - -RoundTrip_Impl::RoundTrip_exec_i::RoundTrip_exec_i () -{ - -} - -RoundTrip_Impl::RoundTrip_exec_i::~RoundTrip_exec_i () -{ -} - -NodeAppTest::CCM_LatencyTest_ptr -RoundTrip_Impl::RoundTrip_exec_i::get_facet_1(ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return new RoundTrip_Impl::LatencyTest_Impl (); -} - -NodeAppTest::CCM_LatencyTest_ptr -RoundTrip_Impl::RoundTrip_exec_i::get_facet_2(ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return new RoundTrip_Impl::LatencyTest_Impl (); -} - -CORBA::Long -RoundTrip_Impl::RoundTrip_exec_i::cube_long (CORBA::Long data) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return data*data*data; -} - -// Operations from Components::SessionComponent -void -RoundTrip_Impl::RoundTrip_exec_i::set_session_context (Components::SessionContext_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, "RoundTrip_Impl::RoundTrip_exec_i::set_session_context\n")); - ACE_CHECK; - -} - -void -RoundTrip_Impl::RoundTrip_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, "RoundTrip_Impl::RoundTrip_exec_i::ccm_activate\n")); - -} - -void -RoundTrip_Impl::RoundTrip_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, "RoundTrip_Impl::RoundTrip_exec_i::ccm_passivate\n")); -} - -void -RoundTrip_Impl::RoundTrip_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, "RoundTrip_Impl::RoundTrip_exec_i::ccm_remove\n")); -} - -void -RoundTrip_Impl::RoundTrip_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, "RoundTrip_Impl::RoundTrip_exec_i::ciao_preactivate\n")); - -} - -void -RoundTrip_Impl::RoundTrip_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, "RoundTrip_Impl::RoundTrip_exec_i::ciao_postactivate\n")); -} - -RoundTrip_Impl::RoundTripHome_exec_i::RoundTripHome_exec_i () -{ -} - -RoundTrip_Impl::RoundTripHome_exec_i::~RoundTripHome_exec_i () -{ -} - -::Components::EnterpriseComponent_ptr -RoundTrip_Impl::RoundTripHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - return new RoundTrip_Impl::RoundTrip_exec_i (); -} - -// Implementation for the probided inferface. -CORBA::Long -RoundTrip_Impl::LatencyTest_Impl::cube_long (CORBA::Long data) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return data*data*data; -} - -extern "C" NODEAPPTEST_ROUNDTRIP_EXEC_Export -::Components::HomeExecutorBase_ptr -createRoundTripHome_Impl (void) -{ - if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, "Creating Round_trip impl\n")); - - return new RoundTrip_Impl::RoundTripHome_exec_i (); -} diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec.h b/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec.h deleted file mode 100644 index 12815a1171a..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec.h +++ /dev/null @@ -1,136 +0,0 @@ -// $Id$ - -//============================================================ -/** - * @file RoundTrip_exec.h - * - * Header file for the Executor implementation. - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - */ -//============================================================ - -#ifndef NODEAPP_ROUNDTRIP_EXEC_H -#define NODEAPP_ROUNDTRIP_EXEC_H - -#include "NodeAppTest_RoundTripEC.h" -#include "RoundTrip_exec_export.h" -#include "tao/LocalObject.h" - -namespace RoundTrip_Impl -{ - - /** - * @class RoundTrip_exec_i - * - * RoundTrip executor implementation class. - */ - - class NODEAPPTEST_ROUNDTRIP_EXEC_Export RoundTrip_exec_i : - public virtual NodeAppTest::LatencyTest, - public virtual RoundTrip_Impl::RoundTrip_Exec, - public virtual TAO_Local_RefCounted_Object - { - - public: - /// Default constructor. - RoundTrip_exec_i (); - - /// Default destructor. - ~RoundTrip_exec_i (); - - /// Operation to test the data - virtual CORBA::Long cube_long (CORBA::Long data) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /* - virtual ::NodeAppTest::CCM_LatencyTest* - get_latency (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - */ - - NodeAppTest::CCM_LatencyTest_ptr - get_facet_1(ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - - NodeAppTest::CCM_LatencyTest_ptr - get_facet_2(ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - /// Helper function to be called back by timeout_Handler - void pulse (void); - - // CIAO defined methods - virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - }; - - // - // - // - class LatencyTest_Impl : public virtual NodeAppTest::CCM_LatencyTest, - public virtual TAO_Local_RefCounted_Object - { - public: - LatencyTest_Impl () - { - } - - virtual CORBA::Long cube_long (CORBA::Long data) - ACE_THROW_SPEC ((CORBA::SystemException)); - }; - - /** - * @class RoundTripHome_exec_i - * - * RoundTrip home executor implementation class. - */ - class NODEAPPTEST_ROUNDTRIP_EXEC_Export RoundTripHome_exec_i : - public virtual RoundTrip_Impl::RoundTripHome_Exec, - public virtual TAO_Local_RefCounted_Object - { - public: - /// Default ctor. - RoundTripHome_exec_i (); - - /// Default dtor. - ~RoundTripHome_exec_i (); - - // Implicit home operations. - - virtual ::Components::EnterpriseComponent_ptr - create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - }; - -} - -extern "C" NODEAPPTEST_ROUNDTRIP_EXEC_Export -::Components::HomeExecutorBase_ptr createRoundTripHome_Impl (void); - -#endif /* NODEAPP_ROUNDTRIPGEN_EXEC_H */ diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec_export.h b/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec_export.h deleted file mode 100644 index ba26507df22..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_exec_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl NODEAPPTEST_ROUNDTRIP_EXEC -// ------------------------------ -#ifndef NODEAPPTEST_ROUNDTRIP_EXEC_EXPORT_H -#define NODEAPPTEST_ROUNDTRIP_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (NODEAPPTEST_ROUNDTRIP_EXEC_HAS_DLL) -# define NODEAPPTEST_ROUNDTRIP_EXEC_HAS_DLL 1 -#endif /* ! NODEAPPTEST_ROUNDTRIP_EXEC_HAS_DLL */ - -#if defined (NODEAPPTEST_ROUNDTRIP_EXEC_HAS_DLL) && (NODEAPPTEST_ROUNDTRIP_EXEC_HAS_DLL == 1) -# if defined (NODEAPPTEST_ROUNDTRIP_EXEC_BUILD_DLL) -# define NODEAPPTEST_ROUNDTRIP_EXEC_Export ACE_Proper_Export_Flag -# define NODEAPPTEST_ROUNDTRIP_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define NODEAPPTEST_ROUNDTRIP_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* NODEAPPTEST_ROUNDTRIP_EXEC_BUILD_DLL */ -# define NODEAPPTEST_ROUNDTRIP_EXEC_Export ACE_Proper_Import_Flag -# define NODEAPPTEST_ROUNDTRIP_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define NODEAPPTEST_ROUNDTRIP_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* NODEAPPTEST_ROUNDTRIP_EXEC_BUILD_DLL */ -#else /* NODEAPPTEST_ROUNDTRIP_EXEC_HAS_DLL == 1 */ -# define NODEAPPTEST_ROUNDTRIP_EXEC_Export -# define NODEAPPTEST_ROUNDTRIP_EXEC_SINGLETON_DECLARATION(T) -# define NODEAPPTEST_ROUNDTRIP_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* NODEAPPTEST_ROUNDTRIP_EXEC_HAS_DLL == 1 */ - -// Set NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE */ - -#if (NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE == 1) -# define NODEAPPTEST_ROUNDTRIP_EXEC_TRACE(X) -#else /* (NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define NODEAPPTEST_ROUNDTRIP_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (NODEAPPTEST_ROUNDTRIP_EXEC_NTRACE == 1) */ - -#endif /* NODEAPPTEST_ROUNDTRIP_EXEC_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_stub_export.h b/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_stub_export.h deleted file mode 100644 index d82c188c509..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl NODEAPPTEST_ROUNDTRIP_STUB -// ------------------------------ -#ifndef NODEAPPTEST_ROUNDTRIP_STUB_EXPORT_H -#define NODEAPPTEST_ROUNDTRIP_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (NODEAPPTEST_ROUNDTRIP_STUB_HAS_DLL) -# define NODEAPPTEST_ROUNDTRIP_STUB_HAS_DLL 1 -#endif /* ! NODEAPPTEST_ROUNDTRIP_STUB_HAS_DLL */ - -#if defined (NODEAPPTEST_ROUNDTRIP_STUB_HAS_DLL) && (NODEAPPTEST_ROUNDTRIP_STUB_HAS_DLL == 1) -# if defined (NODEAPPTEST_ROUNDTRIP_STUB_BUILD_DLL) -# define NODEAPPTEST_ROUNDTRIP_STUB_Export ACE_Proper_Export_Flag -# define NODEAPPTEST_ROUNDTRIP_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define NODEAPPTEST_ROUNDTRIP_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* NODEAPPTEST_ROUNDTRIP_STUB_BUILD_DLL */ -# define NODEAPPTEST_ROUNDTRIP_STUB_Export ACE_Proper_Import_Flag -# define NODEAPPTEST_ROUNDTRIP_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define NODEAPPTEST_ROUNDTRIP_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* NODEAPPTEST_ROUNDTRIP_STUB_BUILD_DLL */ -#else /* NODEAPPTEST_ROUNDTRIP_STUB_HAS_DLL == 1 */ -# define NODEAPPTEST_ROUNDTRIP_STUB_Export -# define NODEAPPTEST_ROUNDTRIP_STUB_SINGLETON_DECLARATION(T) -# define NODEAPPTEST_ROUNDTRIP_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* NODEAPPTEST_ROUNDTRIP_STUB_HAS_DLL == 1 */ - -// Set NODEAPPTEST_ROUNDTRIP_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (NODEAPPTEST_ROUNDTRIP_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define NODEAPPTEST_ROUNDTRIP_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define NODEAPPTEST_ROUNDTRIP_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !NODEAPPTEST_ROUNDTRIP_STUB_NTRACE */ - -#if (NODEAPPTEST_ROUNDTRIP_STUB_NTRACE == 1) -# define NODEAPPTEST_ROUNDTRIP_STUB_TRACE(X) -#else /* (NODEAPPTEST_ROUNDTRIP_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define NODEAPPTEST_ROUNDTRIP_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (NODEAPPTEST_ROUNDTRIP_STUB_NTRACE == 1) */ - -#endif /* NODEAPPTEST_ROUNDTRIP_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_svnt_export.h b/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_svnt_export.h deleted file mode 100644 index b84617f9ff0..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/RoundTrip_svnt_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl NODEAPPTEST_ROUNDTRIP_SVNT -// ------------------------------ -#ifndef NODEAPPTEST_ROUNDTRIP_SVNT_EXPORT_H -#define NODEAPPTEST_ROUNDTRIP_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (NODEAPPTEST_ROUNDTRIP_SVNT_HAS_DLL) -# define NODEAPPTEST_ROUNDTRIP_SVNT_HAS_DLL 1 -#endif /* ! NODEAPPTEST_ROUNDTRIP_SVNT_HAS_DLL */ - -#if defined (NODEAPPTEST_ROUNDTRIP_SVNT_HAS_DLL) && (NODEAPPTEST_ROUNDTRIP_SVNT_HAS_DLL == 1) -# if defined (NODEAPPTEST_ROUNDTRIP_SVNT_BUILD_DLL) -# define NODEAPPTEST_ROUNDTRIP_SVNT_Export ACE_Proper_Export_Flag -# define NODEAPPTEST_ROUNDTRIP_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define NODEAPPTEST_ROUNDTRIP_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* NODEAPPTEST_ROUNDTRIP_SVNT_BUILD_DLL */ -# define NODEAPPTEST_ROUNDTRIP_SVNT_Export ACE_Proper_Import_Flag -# define NODEAPPTEST_ROUNDTRIP_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define NODEAPPTEST_ROUNDTRIP_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* NODEAPPTEST_ROUNDTRIP_SVNT_BUILD_DLL */ -#else /* NODEAPPTEST_ROUNDTRIP_SVNT_HAS_DLL == 1 */ -# define NODEAPPTEST_ROUNDTRIP_SVNT_Export -# define NODEAPPTEST_ROUNDTRIP_SVNT_SINGLETON_DECLARATION(T) -# define NODEAPPTEST_ROUNDTRIP_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* NODEAPPTEST_ROUNDTRIP_SVNT_HAS_DLL == 1 */ - -// Set NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE */ - -#if (NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE == 1) -# define NODEAPPTEST_ROUNDTRIP_SVNT_TRACE(X) -#else /* (NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define NODEAPPTEST_ROUNDTRIP_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (NODEAPPTEST_ROUNDTRIP_SVNT_NTRACE == 1) */ - -#endif /* NODEAPPTEST_ROUNDTRIP_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test.pl b/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test.pl deleted file mode 100755 index 66bd2b1120f..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test.pl +++ /dev/null @@ -1,47 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "../../../../../bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); - -for ($iter = 0; $iter <= $#ARGV; $iter++) { - if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { - print "Run_Test Perl script for NodeApplicationTest \n\n"; - print "run_test \n"; - print "\n"; - print "-h -- prints this information\n"; - exit 0; - } -} - - -unlink $iorfile; -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", - "-n -o $iorfile"); - -$CL = new PerlACE::Process ("client", - "-k file://$iorfile -n 4"); - -$SV->Spawn (); - -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); - exit 1; -} - -$CL->SpawnWaitKill (10); -$server = $SV->Kill (); - -unlink $iorfile; - -exit $status; diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test_ex.pl b/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test_ex.pl deleted file mode 100755 index 1840175abde..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test_ex.pl +++ /dev/null @@ -1,47 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "../../../../../bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); - -for ($iter = 0; $iter <= $#ARGV; $iter++) { - if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { - print "Run_Test Perl script for NodeApplicationTest \n\n"; - print "run_test \n"; - print "\n"; - print "-h -- prints this information\n"; - exit 0; - } -} - - -unlink $iorfile; -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", - "-n -o $iorfile"); - -$CL = new PerlACE::Process ("client_ex", - "-k file://$iorfile"); - -$SV->Spawn (); - -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); - exit 1; -} - -$CL->SpawnWaitKill (10); -$server = $SV->Kill (); - -unlink $iorfile; - -exit $status; diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test_simple.pl b/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test_simple.pl deleted file mode 100755 index 26b7edf2c14..00000000000 --- a/TAO/CIAO/DnC/tests/NodeApplicationTest/run_test_simple.pl +++ /dev/null @@ -1,47 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "../../../../../bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); - -for ($iter = 0; $iter <= $#ARGV; $iter++) { - if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { - print "Run_Test Perl script for NodeApplicationTest \n\n"; - print "run_test \n"; - print "\n"; - print "-h -- prints this information\n"; - exit 0; - } -} - - -unlink $iorfile; -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", - "-n -o $iorfile"); - -$CL = new PerlACE::Process ("client_simple", - "-k file://$iorfile "); - -$SV->Spawn (); - -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); - exit 1; -} - -$CL->SpawnWaitKill (10); -$server = $SV->Kill (); - -unlink $iorfile; - -exit $status; diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.cidl b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.cidl deleted file mode 100644 index 4908c11cd8d..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.cidl +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ -#include "HumanMachineInterface.idl" - -composition session HumanMachineInterface_Impl -{ - home executor HumanMachineInterfaceHome_Exec - { - implements RobotAssembly::HumanMachineInterfaceHome; - manages HumanMachineInterface_Exec; - }; -}; - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.idl b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.idl deleted file mode 100644 index 41807830445..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.idl +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ -#include "../Robot_Base.idl" - -module RobotAssembly -{ - component HumanMachineInterface - { - // Production Interfaces. - uses WorkOrderResponses HumanResponse; - consumes DisplayWork WorkDisplayUpdate; - - // Development Interfaces. - provides HMIController Controller; - }; - home HumanMachineInterfaceHome manages HumanMachineInterface {}; - -}; diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.mpc b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.mpc deleted file mode 100644 index aae47e4c1d5..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.mpc +++ /dev/null @@ -1,55 +0,0 @@ -// $Id$ -project(HumanMachineInterface_stub): ciao_client_dnc { - after += RobotAssembly_stub - sharedname = HumanMachineInterface_stub - libs += RobotAssembly_stub - idlflags += -Wb,stub_export_macro=HUMANMACHINEINTERFACE_STUB_Export -Wb,stub_export_include=HumanMachineInterface_stub_export.h -Wb,skel_export_macro=HUMANMACHINEINTERFACE_SVNT_Export -Wb,skel_export_include=HumanMachineInterface_svnt_export.h - dynamicflags = HUMANMACHINEINTERFACE_STUB_BUILD_DLL - - IDL_Files { - HumanMachineInterface.idl - } - - Source_Files { - HumanMachineInterfaceC.cpp - } -} - -project(HumanMachineInterface_svnt) : ciao_servant_dnc { - after += HumanMachineInterface_stub - sharedname = HumanMachineInterface_svnt - libs += HumanMachineInterface_stub RobotAssembly_stub RobotAssembly_svnt - - idlflags += -Wb,export_macro=HUMANMACHINEINTERFACE_SVNT_Export -Wb,export_include=HumanMachineInterface_svnt_export.h - dynamicflags = HUMANMACHINEINTERFACE_SVNT_BUILD_DLL - - CIDL_Files { - HumanMachineInterface.cidl - } - - IDL_Files { - HumanMachineInterfaceE.idl - } - - Source_Files { - HumanMachineInterfaceEC.cpp - HumanMachineInterfaceS.cpp - HumanMachineInterface_svnt.cpp - } -} - -project(HumanMachineInterface_exec) : ciao_component_dnc { - after += HumanMachineInterface_svnt - sharedname = HumanMachineInterface_exec - libs += RobotAssembly_stub RobotAssembly_svnt HumanMachineInterface_stub HumanMachineInterface_svnt - libpaths += .. - idlflags += -Wb,export_macro=HUMANMACHINEINTERFACE_EXEC_Export -Wb,export_include=RobotManger_exec_export.h - dynamicflags = HUMANMACHINEINTERFACE_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HumanMachineInterface_exec.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.cpp b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.cpp deleted file mode 100644 index 6ce0187efa4..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.cpp +++ /dev/null @@ -1,198 +0,0 @@ -// $Id$ -// HumanMachineInterface_exec.cpp - -#include "HumanMachineInterface_exec.h" - -// MangementWorkInstructions_exec_i -// -// -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::~HumanMachineInterface_exec_i () -{ -} - -// consumes DisplayWork WorkDisplayUpdate; -void -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::push_WorkDisplayUpdate (RobotAssembly::DisplayWork *ev ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, "HumanMachineInterface - In push_WorkDisplayUpdate event sink \n")); - /* eventtype DisplayWork { - public DisplayRequest Display; - public WorkOrder Order; - public StatusType Status; - }; -*/ - // Following Code Simulates what will happen when the gui is attached - // This codes should eventually be removed and replaced - - RobotAssembly::StatusType myStatus = ev->Status(); - RobotAssembly::WorkOrder myOrder = ev->Order(); - RobotAssembly::DisplayRequest myDisplay = ev->Display(); - - if (myStatus == RobotAssembly::unacknowledged) { - printf("\tWorkOrder %d was unacknowledged and is changed to accepted (2e) \n", myOrder.OrderNumber); - myStatus = RobotAssembly::accepted; - // 1f call - // void AcceptWorkOrderResponse(in WorkOrder Order, in StatusType Status); - RobotAssembly::WorkOrderResponses_var rev - = this->context_->get_connection_HumanResponse (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (rev.in ())) - ACE_THROW (CORBA::BAD_INV_ORDER ()); - - rev->AcceptWorkOrderResponse(myOrder, myStatus ACE_ENV_SINGLE_ARG_PARAMETER); - - - } else if (myStatus == RobotAssembly::accepted) { - printf("\tWorkOrder %d was accepted and is changed to ready (6e) \n", myOrder.OrderNumber); - myStatus = RobotAssembly::ready; - // 2f call - // void SetTimeResponse(in WorkOrder Order, in StatusType Status); - RobotAssembly::WorkOrderResponses_var rev - = this->context_->get_connection_HumanResponse (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (rev.in ())) - ACE_THROW (CORBA::BAD_INV_ORDER ()); - - rev->SetTimeResponse(myOrder, myStatus ACE_ENV_SINGLE_ARG_PARAMETER); - - } else if (myStatus == RobotAssembly::ready) { - printf("\tWorkOrder %d was ready and is changed to completed (9e) \n", myOrder.OrderNumber); - myStatus = RobotAssembly::complete; - // 3f call - // void AcceptFinalProductResponse(in WorkOrder, in StatusType Status); - RobotAssembly::WorkOrderResponses_var rev - = this->context_->get_connection_HumanResponse (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (rev.in ())) - ACE_THROW (CORBA::BAD_INV_ORDER ()); - - rev->AcceptFinalProductResponse(myOrder, myStatus ACE_ENV_SINGLE_ARG_PARAMETER); - } else { - printf("\tERROR: WorkOrder %d has an invalid status value\n", myOrder.OrderNumber); - } - -} - -RobotAssembly::CCM_HMIController_ptr -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::get_Controller (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, "HumanMachineInterface_Impl::HumanMachineInterface_exec.i::get_Controller called\n ")); - return (new HMIController_Impl (*this)); -} - -// provides HMIController Controller; -// string TextToDisplay(); -char * -HumanMachineInterface_Impl::HMIController_Impl::TextToDisplay (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return "TextToDisplay"; -} - -// void KeyResponse( in short key); -void -HumanMachineInterface_Impl::HMIController_Impl::KeyResponse (CORBA::Short key ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -// string getHost(); -char * -HumanMachineInterface_Impl::HMIController_Impl::getHost (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return "getHost"; -} - - - -// Operations from Components::SessionComponen -void -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::set_session_context (Components::SessionContext_ptr ctx ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "HumanMachineInterface_Impl::HumanMachineInterface_exec_i::set_session_context\n")); - - this->context_ = HumanMachineInterface_Impl::HumanMachineInterface_Exec_Context::_narrow (ctx ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - - if (CORBA::is_nil (this->context_.in ())) - - ACE_THROW (CORBA::INTERNAL ()); - // Urm, we actually discard exceptions thown from this operation. -} - -void -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ciao_preactivate\n")); -} - -void -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ccm_activate\n")); -} - -void -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ciao_postactivate\n")); -} - - -void -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ccm_passivate\n")); -} - -void -HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "HumanMachineInterface_Impl::HumanMachineInterface_exec_i::ccm_remove\n")); -} - - -// HumanMachineInterfaceHome_exec_i -// -// -HumanMachineInterface_Impl::HumanMachineInterfaceHome_exec_i::HumanMachineInterfaceHome_exec_i () -{ -} - -HumanMachineInterface_Impl::HumanMachineInterfaceHome_exec_i::~HumanMachineInterfaceHome_exec_i () -{ -} - -::Components::EnterpriseComponent_ptr -HumanMachineInterface_Impl::HumanMachineInterfaceHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - return new HumanMachineInterface_Impl::HumanMachineInterface_exec_i; -} - - -extern "C" HUMANMACHINEINTERFACE_EXEC_Export ::Components::HomeExecutorBase_ptr -createHumanMachineInterfaceHome_Impl (void) -{ - return new HumanMachineInterface_Impl::HumanMachineInterfaceHome_exec_i (); -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.h b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.h deleted file mode 100644 index 2532fc33c5b..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.h +++ /dev/null @@ -1,137 +0,0 @@ -// $Id$ -// HumanMachineInterface_exec.h -//============================================================ -/** -* @file HumanMachineInterface_exec.h -* -* Header file for the Executor implementation. -*/ -//============================================================ - -//#ifndef HUMANMACHINEINTERFACE_EXEC_H -//#define HUMANMACHINEINTERFACE_EXEC_H - -#include "HumanMachineInterfaceEC.h" -#include "HumanMachineInterface_exec_export.h" - -#include "tao/LocalObject.h" - -namespace HumanMachineInterface_Impl -{ -/** -* @class HumanMachineInterface_exec_i -* -* HumanMachineInterface executor implementation class. - */ - - class HUMANMACHINEINTERFACE_EXEC_Export HumanMachineInterface_exec_i : - public virtual HumanMachineInterface_Exec, - public virtual TAO_Local_RefCounted_Object - { - - public: - /// Default constructor. - HumanMachineInterface_exec_i () { } - - /// Default destructor. - virtual ~HumanMachineInterface_exec_i (); - - -// consumes DisplayWork WorkDisplayUpdate; - virtual void push_WorkDisplayUpdate (RobotAssembly::DisplayWork *ev ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual RobotAssembly::CCM_HMIController_ptr get_Controller (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - - protected: - /// Component specific context - HumanMachineInterface_Exec_Context_var context_; - friend class HMIController_Impl; - }; - - -// provides HMIController Controller; - class HMIController_Impl : public virtual RobotAssembly::CCM_HMIController, - public virtual TAO_Local_RefCounted_Object - { - public: - HMIController_Impl(HumanMachineInterface_exec_i& component) : component_ (component) - { } - - // string TextToDisplay(); - virtual char * TextToDisplay (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // void KeyResponse( in short key); - virtual void KeyResponse (CORBA::Short key ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - // string getHost(); - virtual char * getHost (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - - private: - HumanMachineInterface_exec_i& component_; - }; - - - - - /** - * @class HumanMachineInterfaceHome_exec_i - * -* HumanMachineInterface home executor implementation class. -*/ -class HUMANMACHINEINTERFACE_EXEC_Export HumanMachineInterfaceHome_exec_i : -public virtual HumanMachineInterfaceHome_Exec, -public virtual TAO_Local_RefCounted_Object -{ -public: - /// Default ctor. - HumanMachineInterfaceHome_exec_i (); - - /// Default dtor. - virtual ~HumanMachineInterfaceHome_exec_i (); - - // Implicit home operations. - - virtual ::Components::EnterpriseComponent_ptr - create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); -}; - -} - -extern "C" HUMANMACHINEINTERFACE_EXEC_Export ::Components::HomeExecutorBase_ptr -createHumanMachineInterfaceHome_Impl (void); - -//#endif /* MANAGEMENTWORKINSTRUCTONS_EXEC_H */ diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec_export.h deleted file mode 100644 index 764854134cf..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl HUMANMACHINEINTERFACE_EXEC -// ------------------------------ -#ifndef HUMANMACHINEINTERFACE_EXEC_EXPORT_H -#define HUMANMACHINEINTERFACE_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (HUMANMACHINEINTERFACE_EXEC_HAS_DLL) -# define HUMANMACHINEINTERFACE_EXEC_HAS_DLL 1 -#endif /* ! HUMANMACHINEINTERFACE_EXEC_HAS_DLL */ - -#if defined (HUMANMACHINEINTERFACE_EXEC_HAS_DLL) && (HUMANMACHINEINTERFACE_EXEC_HAS_DLL == 1) -# if defined (HUMANMACHINEINTERFACE_EXEC_BUILD_DLL) -# define HUMANMACHINEINTERFACE_EXEC_Export ACE_Proper_Export_Flag -# define HUMANMACHINEINTERFACE_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define HUMANMACHINEINTERFACE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* HUMANMACHINEINTERFACE_EXEC_BUILD_DLL */ -# define HUMANMACHINEINTERFACE_EXEC_Export ACE_Proper_Import_Flag -# define HUMANMACHINEINTERFACE_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define HUMANMACHINEINTERFACE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* HUMANMACHINEINTERFACE_EXEC_BUILD_DLL */ -#else /* HUMANMACHINEINTERFACE_EXEC_HAS_DLL == 1 */ -# define HUMANMACHINEINTERFACE_EXEC_Export -# define HUMANMACHINEINTERFACE_EXEC_SINGLETON_DECLARATION(T) -# define HUMANMACHINEINTERFACE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* HUMANMACHINEINTERFACE_EXEC_HAS_DLL == 1 */ - -// Set HUMANMACHINEINTERFACE_EXEC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (HUMANMACHINEINTERFACE_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define HUMANMACHINEINTERFACE_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define HUMANMACHINEINTERFACE_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !HUMANMACHINEINTERFACE_EXEC_NTRACE */ - -#if (HUMANMACHINEINTERFACE_EXEC_NTRACE == 1) -# define HUMANMACHINEINTERFACE_EXEC_TRACE(X) -#else /* (HUMANMACHINEINTERFACE_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define HUMANMACHINEINTERFACE_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (HUMANMACHINEINTERFACE_EXEC_NTRACE == 1) */ - -#endif /* HUMANMACHINEINTERFACE_EXEC_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_stub_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_stub_export.h deleted file mode 100644 index 9956f4c80bd..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl HUMANMACHINEINTERFACE_STUB -// ------------------------------ -#ifndef HUMANMACHINEINTERFACE_STUB_EXPORT_H -#define HUMANMACHINEINTERFACE_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (HUMANMACHINEINTERFACE_STUB_HAS_DLL) -# define HUMANMACHINEINTERFACE_STUB_HAS_DLL 1 -#endif /* ! HUMANMACHINEINTERFACE_STUB_HAS_DLL */ - -#if defined (HUMANMACHINEINTERFACE_STUB_HAS_DLL) && (HUMANMACHINEINTERFACE_STUB_HAS_DLL == 1) -# if defined (HUMANMACHINEINTERFACE_STUB_BUILD_DLL) -# define HUMANMACHINEINTERFACE_STUB_Export ACE_Proper_Export_Flag -# define HUMANMACHINEINTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define HUMANMACHINEINTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* HUMANMACHINEINTERFACE_STUB_BUILD_DLL */ -# define HUMANMACHINEINTERFACE_STUB_Export ACE_Proper_Import_Flag -# define HUMANMACHINEINTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define HUMANMACHINEINTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* HUMANMACHINEINTERFACE_STUB_BUILD_DLL */ -#else /* HUMANMACHINEINTERFACE_STUB_HAS_DLL == 1 */ -# define HUMANMACHINEINTERFACE_STUB_Export -# define HUMANMACHINEINTERFACE_STUB_SINGLETON_DECLARATION(T) -# define HUMANMACHINEINTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* HUMANMACHINEINTERFACE_STUB_HAS_DLL == 1 */ - -// Set HUMANMACHINEINTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (HUMANMACHINEINTERFACE_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define HUMANMACHINEINTERFACE_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define HUMANMACHINEINTERFACE_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !HUMANMACHINEINTERFACE_STUB_NTRACE */ - -#if (HUMANMACHINEINTERFACE_STUB_NTRACE == 1) -# define HUMANMACHINEINTERFACE_STUB_TRACE(X) -#else /* (HUMANMACHINEINTERFACE_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define HUMANMACHINEINTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (HUMANMACHINEINTERFACE_STUB_NTRACE == 1) */ - -#endif /* HUMANMACHINEINTERFACE_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_svnt_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_svnt_export.h deleted file mode 100644 index 9e348f1b8e6..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_svnt_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl HUMANMACHINEINTERFACE_SVNT -// ------------------------------ -#ifndef HUMANMACHINEINTERFACE_SVNT_EXPORT_H -#define HUMANMACHINEINTERFACE_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (HUMANMACHINEINTERFACE_SVNT_HAS_DLL) -# define HUMANMACHINEINTERFACE_SVNT_HAS_DLL 1 -#endif /* ! HUMANMACHINEINTERFACE_SVNT_HAS_DLL */ - -#if defined (HUMANMACHINEINTERFACE_SVNT_HAS_DLL) && (HUMANMACHINEINTERFACE_SVNT_HAS_DLL == 1) -# if defined (HUMANMACHINEINTERFACE_SVNT_BUILD_DLL) -# define HUMANMACHINEINTERFACE_SVNT_Export ACE_Proper_Export_Flag -# define HUMANMACHINEINTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define HUMANMACHINEINTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* HUMANMACHINEINTERFACE_SVNT_BUILD_DLL */ -# define HUMANMACHINEINTERFACE_SVNT_Export ACE_Proper_Import_Flag -# define HUMANMACHINEINTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define HUMANMACHINEINTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* HUMANMACHINEINTERFACE_SVNT_BUILD_DLL */ -#else /* HUMANMACHINEINTERFACE_SVNT_HAS_DLL == 1 */ -# define HUMANMACHINEINTERFACE_SVNT_Export -# define HUMANMACHINEINTERFACE_SVNT_SINGLETON_DECLARATION(T) -# define HUMANMACHINEINTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* HUMANMACHINEINTERFACE_SVNT_HAS_DLL == 1 */ - -// Set HUMANMACHINEINTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (HUMANMACHINEINTERFACE_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define HUMANMACHINEINTERFACE_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define HUMANMACHINEINTERFACE_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !HUMANMACHINEINTERFACE_SVNT_NTRACE */ - -#if (HUMANMACHINEINTERFACE_SVNT_NTRACE == 1) -# define HUMANMACHINEINTERFACE_SVNT_TRACE(X) -#else /* (HUMANMACHINEINTERFACE_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define HUMANMACHINEINTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (HUMANMACHINEINTERFACE_SVNT_NTRACE == 1) */ - -#endif /* HUMANMACHINEINTERFACE_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.cidl b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.cidl deleted file mode 100644 index 798fd664958..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.cidl +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ -#include "ManagementWorkInstructions.idl" - -composition session ManagementWorkInstructions_Impl -{ - home executor ManagementWorkInstructionsHome_Exec - { - implements RobotAssembly::ManagementWorkInstructionsHome; - manages ManagementWorkInstructions_Exec; - }; -}; - - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.idl b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.idl deleted file mode 100644 index f85d01af0ad..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ -#include "../Robot_Base.idl" - -module RobotAssembly -{ - component ManagementWorkInstructions - { - // ProductionInterfaces - consumes ProductionStatus ProductionReport; - publishes ProductionWorkOrder sendWorkOrder; - - // Development interface - provides MWIController Controller; - }; - home ManagementWorkInstructionsHome manages ManagementWorkInstructions - { - }; -}; - - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.mpc b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.mpc deleted file mode 100644 index 6f5f5b4d3cc..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.mpc +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -project(ManagementWorkInstructions_stub): ciao_client_dnc { - after += RobotAssembly_stub - sharedname = ManagementWorkInstructions_stub - libs += RobotAssembly_stub - idlflags += -Wb,stub_export_macro=MANAGEMENTWORKINSTRUCTIONS_STUB_Export -Wb,stub_export_include=ManagementWorkInstructions_stub_export.h -Wb,skel_export_macro=MANAGEMENTWORKINSTRUCTIONS_SVNT_Export -Wb,skel_export_include=ManagementWorkInstructions_svnt_export.h - dynamicflags = MANAGEMENTWORKINSTRUCTIONS_STUB_BUILD_DLL - - IDL_Files { - ManagementWorkInstructions.idl - } - - Source_Files { - ManagementWorkInstructionsC.cpp - } -} - -project(ManagementWorkInstructions_svnt) : ciao_servant_dnc { - after += ManagementWorkInstructions_stub - sharedname = ManagementWorkInstructions_svnt - libs += ManagementWorkInstructions_stub RobotAssembly_stub RobotAssembly_svnt - - idlflags += -Wb,export_macro=MANAGEMENTWORKINSTRUCTIONS_SVNT_Export -Wb,export_include=ManagementWorkInstructions_svnt_export.h - dynamicflags = MANAGEMENTWORKINSTRUCTIONS_SVNT_BUILD_DLL - - CIDL_Files { - ManagementWorkInstructions.cidl - } - - IDL_Files { - ManagementWorkInstructionsE.idl - } - - Source_Files { - ManagementWorkInstructionsEC.cpp - ManagementWorkInstructionsS.cpp - ManagementWorkInstructions_svnt.cpp - } -} - -project(ManagementWorkInstructions_exec) : ciao_component_dnc { - after += ManagementWorkInstructions_svnt - sharedname = ManagementWorkInstructions_exec - libs += RobotAssembly_stub RobotAssembly_svnt ManagementWorkInstructions_stub ManagementWorkInstructions_svnt - libpaths += .. - idlflags += -Wb,export_macro=MANAGEMENTWORKINSTRUCTIONS_EXEC_Export -Wb,export_include=RobotManger_exec_export.h - dynamicflags = MANAGEMENTWORKINSTRUCTIONS_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ManagementWorkInstructions_exec.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.cpp b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.cpp deleted file mode 100644 index d50bd91b1f0..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.cpp +++ /dev/null @@ -1,192 +0,0 @@ -// $Id$ -// ManagementWorkInstructions_exec.cpp - -#include "ManagementWorkInstructions_exec.h" - -// MangementWorkInstructions_exec_i -// -// -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::~ManagementWorkInstructions_exec_i () -{ -} - -// consumes ProductionStatus ProductionReport; -// 3e, 12e -// eventtype ProductionStatus { -// public StatusType Status; -// public WorkOrder Order; -// }; - -void -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::push_ProductionReport (RobotAssembly::ProductionStatus *ev ACE_ENV_ARG_DECL_WITH_DEFAULTS) -ACE_THROW_SPEC ((CORBA::SystemException)) { - printf("ManagmentWorkInstructions - In consumes ProductionStatus Production Report\n"); - // 3e, 12e - /*eventtype ProductionStatus { - public StatusType Status; - public WorkOrder Order; - };*/ - - RobotAssembly::StatusType myStatus = ev->Status(); - RobotAssembly::WorkOrder myOrder = ev->Order(); - - if (myStatus == RobotAssembly::accepted) { - printf("\tWorkOrder %d was accepted (3e) \n", myOrder.OrderNumber); - } /*else if (myStatus == RobotAssembly::rejected) { - printf("\tWorkOrder %d was rejected\n", myOrder.OrderNumber); - } */else if (myStatus == RobotAssembly::complete) { - printf("\tYEAH WE REACHED THE END\n\tWorkOrder %d was complete (12e)\n", myOrder.OrderNumber); - } /*else if (myStatus == RobotAssembly::failed) { - printf("\tWorkOrder %d failed\n", myOrder.OrderNumber); - } */else { - printf("\tERROR: WorkOrder %d has an invalid status value\n", myOrder.OrderNumber); - } -} - - -RobotAssembly::CCM_MWIController_ptr -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::get_Controller (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, "ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec.i::get_Controller called\n ")); - return (new MWIController_Impl (*this)); -} - - -void -ManagementWorkInstructions_Impl::MWIController_Impl::SendStringTest (const char *testString ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, "ManagementWorkInstructions initiates the process.\n")); - printf("********************************************\n"); - ACE_DEBUG ((LM_DEBUG, "testString = %s\n", testString)); - printf("********************************************\n"); - -// RobotAssembly::ProductionWorkOrder_var event = new OBV_RobotAssembly::ProductionWorkOrder; -// this->component_.context_->push_sendWorkOrder(event ACE_ENV_ARG_PARAMETER); -} - - -void -ManagementWorkInstructions_Impl::MWIController_Impl::SendOrder(const ::RobotAssembly::WorkOrder & testOrder ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - printf("ManagementWorkInstructions - In Send Order\n"); - RobotAssembly::ProductionWorkOrder_var event = new OBV_RobotAssembly::ProductionWorkOrder; - - event->Order(testOrder); - - this->component_.context_->push_sendWorkOrder(event ACE_ENV_ARG_PARAMETER); - -} - -RobotAssembly::ProductionStatusType ManagementWorkInstructions_Impl::MWIController_Impl::GetOrderStatus (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // FILL IN IMPLEMENTATION CODE - printf("Inside MWI:GetOrderStatus\n"); - RobotAssembly::ProductionStatusType pType; - pType.OrderNumber = 1; - pType.ProductNumber = 2; - pType.Status = RobotAssembly::accepted; - // pType.TimeComplete = 5; - pType.RequestedProduction = 333; - pType.ActualProduction = 342; - - return pType; -} - -char * ManagementWorkInstructions_Impl::MWIController_Impl::getHost (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // FILL IN IMPLEMENTATION CODE - printf("Inside MWI: getHost\n"); - return ""; -} - -// Operations from Components::SessionComponen -void -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::set_session_context\n")); - - this->context_ = ManagementWorkInstructions_Impl::ManagementWorkInstructions_Exec_Context::_narrow (ctx ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - - if (CORBA::is_nil (this->context_.in ())) - - ACE_THROW (CORBA::INTERNAL ()); - // Urm, we actually discard exceptions thown from this operation. -} - -void -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ciao_preactivate\n")); -} - -void -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ccm_activate\n")); -} - -void -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ciao_postactivate\n")); -} - - -void -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ccm_passivate\n")); -} - -void -ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i::ccm_remove\n")); -} - - -// ManagementWorkInstructionsHome_exec_i -// -// -ManagementWorkInstructions_Impl::ManagementWorkInstructionsHome_exec_i::ManagementWorkInstructionsHome_exec_i () -{ -} - -ManagementWorkInstructions_Impl::ManagementWorkInstructionsHome_exec_i::~ManagementWorkInstructionsHome_exec_i () -{ -} - -::Components::EnterpriseComponent_ptr -ManagementWorkInstructions_Impl::ManagementWorkInstructionsHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - return new ManagementWorkInstructions_Impl::ManagementWorkInstructions_exec_i; -} - - -extern "C" MANAGEMENTWORKINSTRUCTIONS_EXEC_Export ::Components::HomeExecutorBase_ptr -createManagementWorkInstructionsHome_Impl (void) -{ - return new ManagementWorkInstructions_Impl::ManagementWorkInstructionsHome_exec_i (); -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.h b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.h deleted file mode 100644 index 99a8facdb63..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.h +++ /dev/null @@ -1,139 +0,0 @@ -// $Id$ -// ManagementWorkInstructions_exec.h -//============================================================ -/** -* @file ManagementWorkInstructions_exec.h -* -* Header file for the Executor implementation. -*/ -//============================================================ - -//#ifndef MANAGEMENTWORKINSTRUCTIONS_EXEC_H -//#define MANAGEMENTWORKINSTRUCTIONS_EXEC_H - -#include "ManagementWorkInstructionsEC.h" -#include "ManagementWorkInstructions_exec_export.h" - -#include "tao/LocalObject.h" - -namespace ManagementWorkInstructions_Impl -{ -/** -* @class ManagementWorkInstructions_exec_i -* -* ManagementWorkInstructions executor implementation class. - */ - - class MANAGEMENTWORKINSTRUCTIONS_EXEC_Export ManagementWorkInstructions_exec_i : - public virtual ManagementWorkInstructions_Exec, - public virtual TAO_Local_RefCounted_Object - { - - public: - /// Default constructor. - ManagementWorkInstructions_exec_i () { } - - /// Default destructor. - virtual ~ManagementWorkInstructions_exec_i (); - - - /* Operations for obtaining the interface reference. */ - /* This method will be used in the assembly face so the - * ObjRef of this read_message facet will be sent to the - * client side(receptacle). - */ - virtual RobotAssembly::CCM_MWIController_ptr get_Controller (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -// consumes ProductionStatus ProductionReport; - virtual void push_ProductionReport (RobotAssembly::ProductionStatus *ev ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - - protected: - /// Component specific context - ManagementWorkInstructions_Exec_Context_var context_; - - friend class MWIController_Impl; - - }; - - class MWIController_Impl : public virtual RobotAssembly::CCM_MWIController, - public virtual TAO_Local_RefCounted_Object - { - public: - MWIController_Impl(ManagementWorkInstructions_exec_i& component) : component_ (component) - { } - - virtual void SendStringTest (const char *testString ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void SendOrder( const ::RobotAssembly::WorkOrder & testOrder ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual RobotAssembly::ProductionStatusType GetOrderStatus (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual char * getHost (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - private: - ManagementWorkInstructions_exec_i& component_; - }; - - /** - * @class ManagementWorkInstructionsHome_exec_i - * - * ManagementWorkInstructions home executor implementation class. - */ - class MANAGEMENTWORKINSTRUCTIONS_EXEC_Export ManagementWorkInstructionsHome_exec_i : - public virtual ManagementWorkInstructionsHome_Exec, - public virtual TAO_Local_RefCounted_Object - { - public: - /// Default ctor. - ManagementWorkInstructionsHome_exec_i (); - - /// Default dtor. - virtual ~ManagementWorkInstructionsHome_exec_i (); - - // Implicit home operations. - - virtual ::Components::EnterpriseComponent_ptr - create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - }; - -} - -extern "C" MANAGEMENTWORKINSTRUCTIONS_EXEC_Export ::Components::HomeExecutorBase_ptr -createManagementWorkInstructionsHome_Impl (void); - -//#endif /* MANAGEMENTWORKINSTRUCTONS_EXEC_H */ diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec_export.h deleted file mode 100644 index 5209b689836..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl MANAGEMENTWORKINSTRUCTIONS_EXEC -// ------------------------------ -#ifndef MANAGEMENTWORKINSTRUCTIONS_EXEC_EXPORT_H -#define MANAGEMENTWORKINSTRUCTIONS_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (MANAGEMENTWORKINSTRUCTIONS_EXEC_HAS_DLL) -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_HAS_DLL 1 -#endif /* ! MANAGEMENTWORKINSTRUCTIONS_EXEC_HAS_DLL */ - -#if defined (MANAGEMENTWORKINSTRUCTIONS_EXEC_HAS_DLL) && (MANAGEMENTWORKINSTRUCTIONS_EXEC_HAS_DLL == 1) -# if defined (MANAGEMENTWORKINSTRUCTIONS_EXEC_BUILD_DLL) -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_Export ACE_Proper_Export_Flag -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* MANAGEMENTWORKINSTRUCTIONS_EXEC_BUILD_DLL */ -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_Export ACE_Proper_Import_Flag -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* MANAGEMENTWORKINSTRUCTIONS_EXEC_BUILD_DLL */ -#else /* MANAGEMENTWORKINSTRUCTIONS_EXEC_HAS_DLL == 1 */ -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_Export -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_SINGLETON_DECLARATION(T) -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* MANAGEMENTWORKINSTRUCTIONS_EXEC_HAS_DLL == 1 */ - -// Set MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE */ - -#if (MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE == 1) -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_TRACE(X) -#else /* (MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define MANAGEMENTWORKINSTRUCTIONS_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (MANAGEMENTWORKINSTRUCTIONS_EXEC_NTRACE == 1) */ - -#endif /* MANAGEMENTWORKINSTRUCTIONS_EXEC_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_stub_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_stub_export.h deleted file mode 100644 index 86aa0fd74f3..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl MANAGEMENTWORKINSTRUCTIONS_STUB -// ------------------------------ -#ifndef MANAGEMENTWORKINSTRUCTIONS_STUB_EXPORT_H -#define MANAGEMENTWORKINSTRUCTIONS_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (MANAGEMENTWORKINSTRUCTIONS_STUB_HAS_DLL) -# define MANAGEMENTWORKINSTRUCTIONS_STUB_HAS_DLL 1 -#endif /* ! MANAGEMENTWORKINSTRUCTIONS_STUB_HAS_DLL */ - -#if defined (MANAGEMENTWORKINSTRUCTIONS_STUB_HAS_DLL) && (MANAGEMENTWORKINSTRUCTIONS_STUB_HAS_DLL == 1) -# if defined (MANAGEMENTWORKINSTRUCTIONS_STUB_BUILD_DLL) -# define MANAGEMENTWORKINSTRUCTIONS_STUB_Export ACE_Proper_Export_Flag -# define MANAGEMENTWORKINSTRUCTIONS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define MANAGEMENTWORKINSTRUCTIONS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* MANAGEMENTWORKINSTRUCTIONS_STUB_BUILD_DLL */ -# define MANAGEMENTWORKINSTRUCTIONS_STUB_Export ACE_Proper_Import_Flag -# define MANAGEMENTWORKINSTRUCTIONS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define MANAGEMENTWORKINSTRUCTIONS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* MANAGEMENTWORKINSTRUCTIONS_STUB_BUILD_DLL */ -#else /* MANAGEMENTWORKINSTRUCTIONS_STUB_HAS_DLL == 1 */ -# define MANAGEMENTWORKINSTRUCTIONS_STUB_Export -# define MANAGEMENTWORKINSTRUCTIONS_STUB_SINGLETON_DECLARATION(T) -# define MANAGEMENTWORKINSTRUCTIONS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* MANAGEMENTWORKINSTRUCTIONS_STUB_HAS_DLL == 1 */ - -// Set MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE */ - -#if (MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE == 1) -# define MANAGEMENTWORKINSTRUCTIONS_STUB_TRACE(X) -#else /* (MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define MANAGEMENTWORKINSTRUCTIONS_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (MANAGEMENTWORKINSTRUCTIONS_STUB_NTRACE == 1) */ - -#endif /* MANAGEMENTWORKINSTRUCTIONS_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_svnt_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_svnt_export.h deleted file mode 100644 index 3f644ee62ed..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_svnt_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl MANAGEMENTWORKINSTRUCTIONS_SVNT -// ------------------------------ -#ifndef MANAGEMENTWORKINSTRUCTIONS_SVNT_EXPORT_H -#define MANAGEMENTWORKINSTRUCTIONS_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (MANAGEMENTWORKINSTRUCTIONS_SVNT_HAS_DLL) -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_HAS_DLL 1 -#endif /* ! MANAGEMENTWORKINSTRUCTIONS_SVNT_HAS_DLL */ - -#if defined (MANAGEMENTWORKINSTRUCTIONS_SVNT_HAS_DLL) && (MANAGEMENTWORKINSTRUCTIONS_SVNT_HAS_DLL == 1) -# if defined (MANAGEMENTWORKINSTRUCTIONS_SVNT_BUILD_DLL) -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_Export ACE_Proper_Export_Flag -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* MANAGEMENTWORKINSTRUCTIONS_SVNT_BUILD_DLL */ -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_Export ACE_Proper_Import_Flag -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* MANAGEMENTWORKINSTRUCTIONS_SVNT_BUILD_DLL */ -#else /* MANAGEMENTWORKINSTRUCTIONS_SVNT_HAS_DLL == 1 */ -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_Export -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_SINGLETON_DECLARATION(T) -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* MANAGEMENTWORKINSTRUCTIONS_SVNT_HAS_DLL == 1 */ - -// Set MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE */ - -#if (MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE == 1) -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_TRACE(X) -#else /* (MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define MANAGEMENTWORKINSTRUCTIONS_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (MANAGEMENTWORKINSTRUCTIONS_SVNT_NTRACE == 1) */ - -#endif /* MANAGEMENTWORKINSTRUCTIONS_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.cidl b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.cidl deleted file mode 100644 index 17e73a54dbd..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.cidl +++ /dev/null @@ -1,11 +0,0 @@ -// $Id$ -#include "PalletConveyorManager.idl" - -composition session PalletConveyorManager_Impl -{ - home executor PalletConveyorManagerHome_Exec - { - implements RobotAssembly::PalletConveyorManagerHome; - manages PalletConveyorManager_Exec; - }; -}; diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.idl b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.idl deleted file mode 100644 index 1d10fd95435..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ -#include "../Robot_Base.idl" - -module RobotAssembly -{ - component PalletConveyorManager - { - // Production Interfaces. - consumes MovePalletRequest PalletRequests; - publishes PalletStatusResponse PalletStatus; - - // Development Interfaces. - provides PCMController Controller; - }; - - home PalletConveyorManagerHome manages PalletConveyorManager {}; - -}; - - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.mpc b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.mpc deleted file mode 100644 index 1b7c89cd2fd..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.mpc +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -project(PalletConveyorManager_stub): ciao_client_dnc { - after += RobotAssembly_stub - sharedname = PalletConveyorManager_stub - libs += RobotAssembly_stub - idlflags += -Wb,stub_export_macro=PALLETCONVEYORMANAGER_STUB_Export -Wb,stub_export_include=PalletConveyorManager_stub_export.h -Wb,skel_export_macro=PALLETCONVEYORMANAGER_SVNT_Export -Wb,skel_export_include=PalletConveyorManager_svnt_export.h - dynamicflags = PALLETCONVEYORMANAGER_STUB_BUILD_DLL - - IDL_Files { - PalletConveyorManager.idl - } - - Source_Files { - PalletConveyorManagerC.cpp - } -} - -project(PalletConveyorManager_svnt) : ciao_servant_dnc { - after += PalletConveyorManager_stub - sharedname = PalletConveyorManager_svnt - libs += PalletConveyorManager_stub RobotAssembly_stub RobotAssembly_svnt - - idlflags += -Wb,export_macro=PALLETCONVEYORMANAGER_SVNT_Export -Wb,export_include=PalletConveyorManager_svnt_export.h - dynamicflags = PALLETCONVEYORMANAGER_SVNT_BUILD_DLL - - CIDL_Files { - PalletConveyorManager.cidl - } - - IDL_Files { - PalletConveyorManagerE.idl - } - - Source_Files { - PalletConveyorManagerEC.cpp - PalletConveyorManagerS.cpp - PalletConveyorManager_svnt.cpp - } -} - -project(PalletConveyorManager_exec) : ciao_component_dnc { - after += PalletConveyorManager_svnt - sharedname = PalletConveyorManager_exec - libs += RobotAssembly_stub RobotAssembly_svnt PalletConveyorManager_stub PalletConveyorManager_svnt - libpaths += .. - idlflags += -Wb,export_macro=PALLETCONVEYORMANAGER_EXEC_Export -Wb,export_include=RobotManger_exec_export.h - dynamicflags = PALLETCONVEYORMANAGER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PalletConveyorManager_exec.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.cpp b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.cpp deleted file mode 100644 index 72921ef8b45..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.cpp +++ /dev/null @@ -1,196 +0,0 @@ -// $Id$ -// PalletConveyorManager_exec.cpp - -#include "PalletConveyorManager_exec.h" - -// MangementWorkInstructions_exec_i -// -// -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::~PalletConveyorManager_exec_i () -{ -} - -//consumes MovePalletRequest PalletRequests; -void -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::push_PalletRequests (RobotAssembly::MovePalletRequest *ev ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, "PalletConveyorManager - In push_PalletStatus event sink (4e, 10e)\n")); - // eventtype MovePalletRequest { - // public MoveRequestType MoveRequest; - // public WorkOrder Order; - // }; - - RobotAssembly::WorkOrder myWorkOrder = ev->Order(); - RobotAssembly::MoveRequestType myMoveRequestType = ev->MoveRequest(); - if (myMoveRequestType == RobotAssembly::GetPalletProductToProcess) { - printf("\tMoveRequestType = GetPalletProductToProcess (4e)\n"); - // Simulate Pallet Ready - this code should be moved to the PCMController once the GUIs are attached - // eventtype PalletStatusResponse { - // public StatusType Status; - // public WorkOrder Order; - // }; - // 5e - // publishes PalletStatusResponse PalletStatus; - RobotAssembly::PalletStatusResponse_var palletStatusResponse_event = new OBV_RobotAssembly::PalletStatusResponse; - palletStatusResponse_event->Order(myWorkOrder); - palletStatusResponse_event->Status(RobotAssembly::palletInPlace); - this->context_->push_PalletStatus(palletStatusResponse_event ACE_ENV_ARG_PARAMETER); - - } else if (myMoveRequestType == RobotAssembly::MovePalletToFinishingArea) { - printf("\tMoveRequestType = MovePalletToFinishingArea (10e)\n"); - // Simulate Pallet Ready - this code should be moved to the PCMController once the GUIs are attached - // eventtype PalletStatusResponse { - // public StatusType Status; - // public WorkOrder Order; - // }; - // 11e - // publishes PalletStatusResponse PalletStatus; - RobotAssembly::PalletStatusResponse_var palletStatusResponse_event = new OBV_RobotAssembly::PalletStatusResponse; - palletStatusResponse_event->Order(myWorkOrder); - palletStatusResponse_event->Status(RobotAssembly::complete); - this->context_->push_PalletStatus(palletStatusResponse_event ACE_ENV_ARG_PARAMETER); - - } -} - -RobotAssembly::CCM_PCMController_ptr -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::get_Controller (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, "PalletConveyorManager_Impl::PalletConveyorManager_exec.i::get_Controller called\n ")); - return (new PCMController_Impl (*this)); -} - -// void SetDiscrete( in Discretes discrete); -void -PalletConveyorManager_Impl::PCMController_Impl::SetPalletStatus (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -// DiscreteValue GetDiscreteStatus( in Discretes discrete); -RobotAssembly::MovePalletRequestType -PalletConveyorManager_Impl::PCMController_Impl::GetOrderStatus (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - RobotAssembly::MovePalletRequestType returnVal; - return returnVal; -} - -// MovePalletRequestType GetOrderStatus(); -RobotAssembly::DiscreteValue -PalletConveyorManager_Impl::PCMController_Impl::GetDiscreteStatus (RobotAssembly::Discretes discrete ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - RobotAssembly::DiscreteValue returnVal; - return returnVal; -} - -// void SetPalletStatus(); -void -PalletConveyorManager_Impl::PCMController_Impl::SetDiscrete (RobotAssembly::Discretes discrete ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} -// string getHost(); -char * -PalletConveyorManager_Impl::PCMController_Impl::getHost (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return "getHost"; -} - - - - - - - - -// Operations from Components::SessionComponen -void -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "PalletConveyorManager_Impl::PalletConveyorManager_exec_i::set_session_context\n")); - - this->context_ = PalletConveyorManager_Impl::PalletConveyorManager_Exec_Context::_narrow (ctx ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - - if (CORBA::is_nil (this->context_.in ())) - - ACE_THROW (CORBA::INTERNAL ()); - // Urm, we actually discard exceptions thown from this operation. -} - -void -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ciao_preactivate\n")); -} - -void -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ccm_activate\n")); -} - -void -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ciao_postactivate\n")); -} - - -void -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ccm_passivate\n")); -} - -void -PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "PalletConveyorManager_Impl::PalletConveyorManager_exec_i::ccm_remove\n")); -} - - -// PalletConveyorManagerHome_exec_i -// -// -PalletConveyorManager_Impl::PalletConveyorManagerHome_exec_i::PalletConveyorManagerHome_exec_i () -{ -} - -PalletConveyorManager_Impl::PalletConveyorManagerHome_exec_i::~PalletConveyorManagerHome_exec_i () -{ -} - -::Components::EnterpriseComponent_ptr -PalletConveyorManager_Impl::PalletConveyorManagerHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - return new PalletConveyorManager_Impl::PalletConveyorManager_exec_i; -} - - -extern "C" PALLETCONVEYORMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr -createPalletConveyorManagerHome_Impl (void) -{ - return new PalletConveyorManager_Impl::PalletConveyorManagerHome_exec_i (); -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.h b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.h deleted file mode 100644 index 297affb6f47..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.h +++ /dev/null @@ -1,142 +0,0 @@ -// $Id$ -// PalletConveyorManager_exec.h -//============================================================ -/** -* @file PalletConveyorManager_exec.h -* -* Header file for the Executor implementation. -*/ -//============================================================ - -//#ifndef PALLETCONVEYORMANAGER_EXEC_H -//#define PALLETCONVEYORMANAGER_EXEC_H - -#include "PalletConveyorManagerEC.h" -#include "PalletConveyorManager_exec_export.h" - -#include "tao/LocalObject.h" - -namespace PalletConveyorManager_Impl -{ -/** -* @class PalletConveyorManager_exec_i -* -* PalletConveyorManager executor implementation class. - */ - - class PALLETCONVEYORMANAGER_EXEC_Export PalletConveyorManager_exec_i : - public virtual PalletConveyorManager_Exec, - public virtual TAO_Local_RefCounted_Object - { - - public: - /// Default constructor. - PalletConveyorManager_exec_i () { } - - /// Default destructor. - virtual ~PalletConveyorManager_exec_i (); - - - //consumes MovePalletRequest PalletRequests; - virtual void push_PalletRequests (RobotAssembly::MovePalletRequest *ev ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual RobotAssembly::CCM_PCMController_ptr get_Controller (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - - protected: - /// Component specific context - PalletConveyorManager_Exec_Context_var context_; - friend class PCMController_Impl; - - }; - -// provides PCMController Controller; - class PCMController_Impl : public virtual RobotAssembly::CCM_PCMController, - public virtual TAO_Local_RefCounted_Object - { - public: - PCMController_Impl(PalletConveyorManager_exec_i& component) : component_ (component) - { } - // void SetDiscrete( in Discretes discrete); - virtual void SetPalletStatus (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // DiscreteValue GetDiscreteStatus( in Discretes discrete); - virtual RobotAssembly::MovePalletRequestType GetOrderStatus (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // MovePalletRequestType GetOrderStatus(); - virtual RobotAssembly::DiscreteValue GetDiscreteStatus (RobotAssembly::Discretes discrete ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // void SetPalletStatus(); - virtual void SetDiscrete (RobotAssembly::Discretes discrete ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // string getHost(); - virtual char * getHost (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - private: - PalletConveyorManager_exec_i& component_; - }; - - - /** - * @class PalletConveyorManagerHome_exec_i - * -* PalletConveyorManager home executor implementation class. -*/ -class PALLETCONVEYORMANAGER_EXEC_Export PalletConveyorManagerHome_exec_i : -public virtual PalletConveyorManagerHome_Exec, -public virtual TAO_Local_RefCounted_Object -{ -public: - /// Default ctor. - PalletConveyorManagerHome_exec_i (); - - /// Default dtor. - virtual ~PalletConveyorManagerHome_exec_i (); - - // Implicit home operations. - - virtual ::Components::EnterpriseComponent_ptr - create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); -}; - -} - -extern "C" PALLETCONVEYORMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr -createPalletConveyorManagerHome_Impl (void); - -//#endif /* PALLETCONVEYORMANAGER_EXEC_H */ diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec_export.h deleted file mode 100644 index 7acb8d6b279..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl PALLETCONVEYORMANAGER_EXEC -// ------------------------------ -#ifndef PALLETCONVEYORMANAGER_EXEC_EXPORT_H -#define PALLETCONVEYORMANAGER_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (PALLETCONVEYORMANAGER_EXEC_HAS_DLL) -# define PALLETCONVEYORMANAGER_EXEC_HAS_DLL 1 -#endif /* ! PALLETCONVEYORMANAGER_EXEC_HAS_DLL */ - -#if defined (PALLETCONVEYORMANAGER_EXEC_HAS_DLL) && (PALLETCONVEYORMANAGER_EXEC_HAS_DLL == 1) -# if defined (PALLETCONVEYORMANAGER_EXEC_BUILD_DLL) -# define PALLETCONVEYORMANAGER_EXEC_Export ACE_Proper_Export_Flag -# define PALLETCONVEYORMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define PALLETCONVEYORMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* PALLETCONVEYORMANAGER_EXEC_BUILD_DLL */ -# define PALLETCONVEYORMANAGER_EXEC_Export ACE_Proper_Import_Flag -# define PALLETCONVEYORMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define PALLETCONVEYORMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* PALLETCONVEYORMANAGER_EXEC_BUILD_DLL */ -#else /* PALLETCONVEYORMANAGER_EXEC_HAS_DLL == 1 */ -# define PALLETCONVEYORMANAGER_EXEC_Export -# define PALLETCONVEYORMANAGER_EXEC_SINGLETON_DECLARATION(T) -# define PALLETCONVEYORMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* PALLETCONVEYORMANAGER_EXEC_HAS_DLL == 1 */ - -// Set PALLETCONVEYORMANAGER_EXEC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (PALLETCONVEYORMANAGER_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define PALLETCONVEYORMANAGER_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define PALLETCONVEYORMANAGER_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !PALLETCONVEYORMANAGER_EXEC_NTRACE */ - -#if (PALLETCONVEYORMANAGER_EXEC_NTRACE == 1) -# define PALLETCONVEYORMANAGER_EXEC_TRACE(X) -#else /* (PALLETCONVEYORMANAGER_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define PALLETCONVEYORMANAGER_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (PALLETCONVEYORMANAGER_EXEC_NTRACE == 1) */ - -#endif /* PALLETCONVEYORMANAGER_EXEC_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_stub_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_stub_export.h deleted file mode 100644 index 038a8b9306a..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl PALLETCONVEYORMANAGER_STUB -// ------------------------------ -#ifndef PALLETCONVEYORMANAGER_STUB_EXPORT_H -#define PALLETCONVEYORMANAGER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (PALLETCONVEYORMANAGER_STUB_HAS_DLL) -# define PALLETCONVEYORMANAGER_STUB_HAS_DLL 1 -#endif /* ! PALLETCONVEYORMANAGER_STUB_HAS_DLL */ - -#if defined (PALLETCONVEYORMANAGER_STUB_HAS_DLL) && (PALLETCONVEYORMANAGER_STUB_HAS_DLL == 1) -# if defined (PALLETCONVEYORMANAGER_STUB_BUILD_DLL) -# define PALLETCONVEYORMANAGER_STUB_Export ACE_Proper_Export_Flag -# define PALLETCONVEYORMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define PALLETCONVEYORMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* PALLETCONVEYORMANAGER_STUB_BUILD_DLL */ -# define PALLETCONVEYORMANAGER_STUB_Export ACE_Proper_Import_Flag -# define PALLETCONVEYORMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define PALLETCONVEYORMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* PALLETCONVEYORMANAGER_STUB_BUILD_DLL */ -#else /* PALLETCONVEYORMANAGER_STUB_HAS_DLL == 1 */ -# define PALLETCONVEYORMANAGER_STUB_Export -# define PALLETCONVEYORMANAGER_STUB_SINGLETON_DECLARATION(T) -# define PALLETCONVEYORMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* PALLETCONVEYORMANAGER_STUB_HAS_DLL == 1 */ - -// Set PALLETCONVEYORMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (PALLETCONVEYORMANAGER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define PALLETCONVEYORMANAGER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define PALLETCONVEYORMANAGER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !PALLETCONVEYORMANAGER_STUB_NTRACE */ - -#if (PALLETCONVEYORMANAGER_STUB_NTRACE == 1) -# define PALLETCONVEYORMANAGER_STUB_TRACE(X) -#else /* (PALLETCONVEYORMANAGER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define PALLETCONVEYORMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (PALLETCONVEYORMANAGER_STUB_NTRACE == 1) */ - -#endif /* PALLETCONVEYORMANAGER_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_svnt_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_svnt_export.h deleted file mode 100644 index 2a4de04b217..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_svnt_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl PALLETCONVEYORMANAGER_SVNT -// ------------------------------ -#ifndef PALLETCONVEYORMANAGER_SVNT_EXPORT_H -#define PALLETCONVEYORMANAGER_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (PALLETCONVEYORMANAGER_SVNT_HAS_DLL) -# define PALLETCONVEYORMANAGER_SVNT_HAS_DLL 1 -#endif /* ! PALLETCONVEYORMANAGER_SVNT_HAS_DLL */ - -#if defined (PALLETCONVEYORMANAGER_SVNT_HAS_DLL) && (PALLETCONVEYORMANAGER_SVNT_HAS_DLL == 1) -# if defined (PALLETCONVEYORMANAGER_SVNT_BUILD_DLL) -# define PALLETCONVEYORMANAGER_SVNT_Export ACE_Proper_Export_Flag -# define PALLETCONVEYORMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define PALLETCONVEYORMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* PALLETCONVEYORMANAGER_SVNT_BUILD_DLL */ -# define PALLETCONVEYORMANAGER_SVNT_Export ACE_Proper_Import_Flag -# define PALLETCONVEYORMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define PALLETCONVEYORMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* PALLETCONVEYORMANAGER_SVNT_BUILD_DLL */ -#else /* PALLETCONVEYORMANAGER_SVNT_HAS_DLL == 1 */ -# define PALLETCONVEYORMANAGER_SVNT_Export -# define PALLETCONVEYORMANAGER_SVNT_SINGLETON_DECLARATION(T) -# define PALLETCONVEYORMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* PALLETCONVEYORMANAGER_SVNT_HAS_DLL == 1 */ - -// Set PALLETCONVEYORMANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (PALLETCONVEYORMANAGER_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define PALLETCONVEYORMANAGER_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define PALLETCONVEYORMANAGER_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !PALLETCONVEYORMANAGER_SVNT_NTRACE */ - -#if (PALLETCONVEYORMANAGER_SVNT_NTRACE == 1) -# define PALLETCONVEYORMANAGER_SVNT_TRACE(X) -#else /* (PALLETCONVEYORMANAGER_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define PALLETCONVEYORMANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (PALLETCONVEYORMANAGER_SVNT_NTRACE == 1) */ - -#endif /* PALLETCONVEYORMANAGER_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly.mpc b/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly.mpc deleted file mode 100644 index 617b1e20edb..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly.mpc +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ -project(RobotAssembly_stub): ciao_client_dnc { - - sharedname = RobotAssembly_stub - idlflags += -Wb,stub_export_macro=ROBOTASSEMBLY_STUB_Export -Wb,stub_export_include=RobotAssembly_stub_export.h -Wb,skel_export_macro=ROBOTASSEMBLY_SVNT_Export -Wb,skel_export_include=RobotAssembly_svnt_export.h - dynamicflags = ROBOTASSEMBLY_STUB_BUILD_DLL - - IDL_Files { - Robot_Base.idl - } - - Source_Files { - Robot_BaseC.cpp - } -} - -project(RobotAssembly_svnt) : ciao_server_dnc { - after += ROBOTASSEMBLY_stub - sharedname = RobotAssembly_svnt - libs += RobotAssembly_stub - - idlflags += -Wb,export_macro=ROBOTASSEMBLY_SVNT_Export -Wb,export_include=ROBOTASSEMBLY_SVNT_export.h - dynamicflags = ROBOTASSEMBLY_SVNT_BUILD_DLL - - Source_Files { - Robot_BaseS.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly.mwc b/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly.mwc deleted file mode 100644 index b07eebca11d..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly.mwc +++ /dev/null @@ -1,4 +0,0 @@ -// $Id$ - -workspace { -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly_stub_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly_stub_export.h deleted file mode 100644 index a7181498d5c..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ROBOTASSEMBLY_STUB -// ------------------------------ -#ifndef ROBOTASSEMBLY_STUB_EXPORT_H -#define ROBOTASSEMBLY_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ROBOTASSEMBLY_STUB_HAS_DLL) -# define ROBOTASSEMBLY_STUB_HAS_DLL 1 -#endif /* ! ROBOTASSEMBLY_STUB_HAS_DLL */ - -#if defined (ROBOTASSEMBLY_STUB_HAS_DLL) && (ROBOTASSEMBLY_STUB_HAS_DLL == 1) -# if defined (ROBOTASSEMBLY_STUB_BUILD_DLL) -# define ROBOTASSEMBLY_STUB_Export ACE_Proper_Export_Flag -# define ROBOTASSEMBLY_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ROBOTASSEMBLY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ROBOTASSEMBLY_STUB_BUILD_DLL */ -# define ROBOTASSEMBLY_STUB_Export ACE_Proper_Import_Flag -# define ROBOTASSEMBLY_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ROBOTASSEMBLY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ROBOTASSEMBLY_STUB_BUILD_DLL */ -#else /* ROBOTASSEMBLY_STUB_HAS_DLL == 1 */ -# define ROBOTASSEMBLY_STUB_Export -# define ROBOTASSEMBLY_STUB_SINGLETON_DECLARATION(T) -# define ROBOTASSEMBLY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ROBOTASSEMBLY_STUB_HAS_DLL == 1 */ - -// Set ROBOTASSEMBLY_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ROBOTASSEMBLY_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ROBOTASSEMBLY_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ROBOTASSEMBLY_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ROBOTASSEMBLY_STUB_NTRACE */ - -#if (ROBOTASSEMBLY_STUB_NTRACE == 1) -# define ROBOTASSEMBLY_STUB_TRACE(X) -#else /* (ROBOTASSEMBLY_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ROBOTASSEMBLY_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ROBOTASSEMBLY_STUB_NTRACE == 1) */ - -#endif /* ROBOTASSEMBLY_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly_svnt_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly_svnt_export.h deleted file mode 100644 index dd9af3876ea..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotAssembly_svnt_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ROBOTASSEMBLY_SVNT -// ------------------------------ -#ifndef ROBOTASSEMBLY_SVNT_EXPORT_H -#define ROBOTASSEMBLY_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ROBOTASSEMBLY_SVNT_HAS_DLL) -# define ROBOTASSEMBLY_SVNT_HAS_DLL 1 -#endif /* ! ROBOTASSEMBLY_SVNT_HAS_DLL */ - -#if defined (ROBOTASSEMBLY_SVNT_HAS_DLL) && (ROBOTASSEMBLY_SVNT_HAS_DLL == 1) -# if defined (ROBOTASSEMBLY_SVNT_BUILD_DLL) -# define ROBOTASSEMBLY_SVNT_Export ACE_Proper_Export_Flag -# define ROBOTASSEMBLY_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ROBOTASSEMBLY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ROBOTASSEMBLY_SVNT_BUILD_DLL */ -# define ROBOTASSEMBLY_SVNT_Export ACE_Proper_Import_Flag -# define ROBOTASSEMBLY_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ROBOTASSEMBLY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ROBOTASSEMBLY_SVNT_BUILD_DLL */ -#else /* ROBOTASSEMBLY_SVNT_HAS_DLL == 1 */ -# define ROBOTASSEMBLY_SVNT_Export -# define ROBOTASSEMBLY_SVNT_SINGLETON_DECLARATION(T) -# define ROBOTASSEMBLY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ROBOTASSEMBLY_SVNT_HAS_DLL == 1 */ - -// Set ROBOTASSEMBLY_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ROBOTASSEMBLY_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ROBOTASSEMBLY_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ROBOTASSEMBLY_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ROBOTASSEMBLY_SVNT_NTRACE */ - -#if (ROBOTASSEMBLY_SVNT_NTRACE == 1) -# define ROBOTASSEMBLY_SVNT_TRACE(X) -#else /* (ROBOTASSEMBLY_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ROBOTASSEMBLY_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ROBOTASSEMBLY_SVNT_NTRACE == 1) */ - -#endif /* ROBOTASSEMBLY_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.cidl b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.cidl deleted file mode 100644 index 2eeb891dd89..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.cidl +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ -#include "RobotManager.idl" - -composition session RobotManager_Impl -{ - home executor RobotManagerHome_Exec - { - implements RobotAssembly::RobotManagerHome; - manages RobotManager_Exec; - }; -}; - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.idl b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.idl deleted file mode 100644 index f85598c8a1c..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ -#include "../Robot_Base.idl" - -module RobotAssembly -{ - component RobotManager - { - // Production Interfaces. - consumes ProcessPallet ProcessPalletCommands; - publishes PalletProcessingStatus ProcessingStatus; - - // Development Interfaces. - provides RMController Controller; - - }; - home RobotManagerHome manages RobotManager {}; - -}; - - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.mpc b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.mpc deleted file mode 100644 index f88bb92a1c7..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager.mpc +++ /dev/null @@ -1,55 +0,0 @@ -// $Id$ -project(RobotManager_stub): ciao_client_dnc { - after += RobotAssembly_stub - sharedname = RobotManager_stub - libs += RobotAssembly_stub - idlflags += -Wb,stub_export_macro=ROBOTMANAGER_STUB_Export -Wb,stub_export_include=RobotManager_stub_export.h -Wb,skel_export_macro=ROBOTMANAGER_SVNT_Export -Wb,skel_export_include=RobotManager_svnt_export.h - dynamicflags = ROBOTMANAGER_STUB_BUILD_DLL - - IDL_Files { - RobotManager.idl - } - - Source_Files { - RobotManagerC.cpp - } -} - -project(RobotManager_svnt) : ciao_servant_dnc { - after += RobotManager_stub - sharedname = RobotManager_svnt - libs += RobotManager_stub RobotAssembly_stub RobotAssembly_svnt - - idlflags += -Wb,export_macro=ROBOTMANAGER_SVNT_Export -Wb,export_include=RobotManager_svnt_export.h - dynamicflags = ROBOTMANAGER_SVNT_BUILD_DLL - - CIDL_Files { - RobotManager.cidl - } - - IDL_Files { - RobotManagerE.idl - } - - Source_Files { - RobotManagerEC.cpp - RobotManagerS.cpp - RobotManager_svnt.cpp - } -} - -project(RobotManager_exec) : ciao_component_dnc { - after += RobotManager_svnt - sharedname = RobotManager_exec - libs += RobotAssembly_stub RobotAssembly_svnt RobotManager_stub RobotManager_svnt - libpaths += .. - idlflags += -Wb,export_macro=ROBOTMANAGER_EXEC_Export -Wb,export_include=RobotManger_exec_export.h - dynamicflags = ROBOTMANAGER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RobotManager_exec.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.cpp b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.cpp deleted file mode 100644 index 17aa1a3b8be..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// $Id$ -// RobotManager_exec.cpp - -#include "RobotManager_exec.h" - -// RobotManager_exec_i -// -// -RobotManager_Impl::RobotManager_exec_i::~RobotManager_exec_i () -{ -} - -// consumes ProcessPallet ProcessPalletCommands; -void -RobotManager_Impl::RobotManager_exec_i::push_ProcessPalletCommands (RobotAssembly::ProcessPallet *ev ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - - // eventtype ProcessPallet { - // public ProcessingOrderType ProcessingOrder; - // public WorkOrder Order; - // }; - - RobotAssembly::WorkOrder myWorkOrder = ev->Order(); - // myProcessingOrderType should have value BeginProcessingPallet - RobotAssembly::ProcessingOrderType myProcessingOrderType = ev->ProcessingOrder(); - - ACE_DEBUG ((LM_DEBUG, "RobotManager - In push_ProcessPalletCommands event sink (7e)\n")); - - // Simulate call 8e - this code should be move to the RMController once the GUI is added - // eventtype PalletProcessingStatus { - // public StatusType Status; - // public WorkOrder Order; - // }; - // 8e publishes PalletProcessingStatus ProcessingStatus; - RobotAssembly::PalletProcessingStatus_var palletProcessingStatus_event = new OBV_RobotAssembly::PalletProcessingStatus; - palletProcessingStatus_event->Order(myWorkOrder); - palletProcessingStatus_event->Status(RobotAssembly::palletProcessed); - this->context_->push_ProcessingStatus(palletProcessingStatus_event ACE_ENV_ARG_PARAMETER); - -} - -RobotAssembly::CCM_RMController_ptr -RobotManager_Impl::RobotManager_exec_i::get_Controller (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, "RobotManager_Impl::RobotManager_exec.i::get_Controller called\n ")); - return (new RMController_Impl (*this)); -} - -// provides RMController Controller; -void -RobotManager_Impl::RMController_Impl::SetProcessingStatus (RobotAssembly::ProcessingOrderType Status ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -// ProcessingOrderType GetProcessingStatus(); -RobotAssembly::ProcessingOrderType -RobotManager_Impl::RMController_Impl::GetProcessingStatus (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - RobotAssembly::ProcessingOrderType returnType; - return returnType; -} - -// string getHost(); -char * -RobotManager_Impl::RMController_Impl::getHost (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return "getHost"; -} - - - - - -// Operations from Components::SessionComponen -void -RobotManager_Impl::RobotManager_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "RobotManager_Impl::RobotManager_exec_i::set_session_context\n")); - - this->context_ = RobotManager_Impl::RobotManager_Exec_Context::_narrow (ctx ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - - if (CORBA::is_nil (this->context_.in ())) - - ACE_THROW (CORBA::INTERNAL ()); - // Urm, we actually discard exceptions thown from this operation. -} - -void -RobotManager_Impl::RobotManager_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"RobotManager_Impl::RobotManager_exec_i::ciao_preactivate\n")); -} - -void -RobotManager_Impl::RobotManager_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"RobotManager_Impl::RobotManager_exec_i::ccm_activate\n")); -} - -void -RobotManager_Impl::RobotManager_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG,"RobotManager_Impl::RobotManager_exec_i::ciao_postactivate\n")); -} - - -void -RobotManager_Impl::RobotManager_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "RobotManager_Impl::RobotManager_exec_i::ccm_passivate\n")); -} - -void -RobotManager_Impl::RobotManager_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "RobotManager_Impl::RobotManager_exec_i::ccm_remove\n")); -} - - -// RobotManagerHome_exec_i -// -// -RobotManager_Impl::RobotManagerHome_exec_i::RobotManagerHome_exec_i () -{ -} - -RobotManager_Impl::RobotManagerHome_exec_i::~RobotManagerHome_exec_i () -{ -} - -::Components::EnterpriseComponent_ptr -RobotManager_Impl::RobotManagerHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - return new RobotManager_Impl::RobotManager_exec_i; -} - - -extern "C" ROBOTMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr -createRobotManagerHome_Impl (void) -{ - return new RobotManager_Impl::RobotManagerHome_exec_i (); -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.h b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.h deleted file mode 100644 index ae05287e246..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.h +++ /dev/null @@ -1,137 +0,0 @@ -// $Id$ -// RobotManager_exec.h -//============================================================ -/** -* @file RobotManager_exec.h -* -* Header file for the Executor implementation. -*/ -//============================================================ - -//#ifndef ROBOTMANAGER_EXEC_H -//#define ROBOTMANAGER_EXEC_H - -#include "RobotManagerEC.h" -#include "RobotManager_exec_export.h" - -#include "tao/LocalObject.h" - -namespace RobotManager_Impl -{ -/** -* @class RobotManager_exec_i -* -* RobotManager executor implementation class. -*/ - - class ROBOTMANAGER_EXEC_Export RobotManager_exec_i : - public virtual RobotManager_Exec, - public virtual TAO_Local_RefCounted_Object - { - - public: - /// Default constructor. - RobotManager_exec_i () { } - - /// Default destructor. - virtual ~RobotManager_exec_i (); - - // consumes ProcessPallet ProcessPalletCommands; - virtual void push_ProcessPalletCommands (RobotAssembly::ProcessPallet *ev ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual RobotAssembly::CCM_RMController_ptr get_Controller (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - - // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - - protected: - /// Component specific context - RobotManager_Exec_Context_var context_; - friend class RMController_Impl; - - }; - // provides RMController Controller; - class RMController_Impl : public virtual RobotAssembly::CCM_RMController, - public virtual TAO_Local_RefCounted_Object - { - public: - RMController_Impl(RobotManager_exec_i& component) : component_ (component) - { } - - // void SetProcessingStatus(in ProcessingOrderType Status); - virtual void SetProcessingStatus (RobotAssembly::ProcessingOrderType Status ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // ProcessingOrderType GetProcessingStatus(); - RobotAssembly::ProcessingOrderType GetProcessingStatus (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // string getHost(); - virtual char * getHost (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - private: - RobotManager_exec_i& component_; - }; - - - - - - /** - * @class RobotManagerHome_exec_i - * -* RobotManager home executor implementation class. -*/ -class ROBOTMANAGER_EXEC_Export RobotManagerHome_exec_i : -public virtual RobotManagerHome_Exec, -public virtual TAO_Local_RefCounted_Object -{ -public: - /// Default ctor. - RobotManagerHome_exec_i (); - - /// Default dtor. - virtual ~RobotManagerHome_exec_i (); - - // Implicit home operations. - - virtual ::Components::EnterpriseComponent_ptr - create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); -}; - -} - -extern "C" ROBOTMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr -createRobotManagerHome_Impl (void); - -//#endif /* ROBOTMANAGER_EXEC_H */ diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec_export.h deleted file mode 100644 index e270d3c7421..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_exec_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ROBOTMANAGER_EXEC -// ------------------------------ -#ifndef ROBOTMANAGER_EXEC_EXPORT_H -#define ROBOTMANAGER_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ROBOTMANAGER_EXEC_HAS_DLL) -# define ROBOTMANAGER_EXEC_HAS_DLL 1 -#endif /* ! ROBOTMANAGER_EXEC_HAS_DLL */ - -#if defined (ROBOTMANAGER_EXEC_HAS_DLL) && (ROBOTMANAGER_EXEC_HAS_DLL == 1) -# if defined (ROBOTMANAGER_EXEC_BUILD_DLL) -# define ROBOTMANAGER_EXEC_Export ACE_Proper_Export_Flag -# define ROBOTMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ROBOTMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ROBOTMANAGER_EXEC_BUILD_DLL */ -# define ROBOTMANAGER_EXEC_Export ACE_Proper_Import_Flag -# define ROBOTMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ROBOTMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ROBOTMANAGER_EXEC_BUILD_DLL */ -#else /* ROBOTMANAGER_EXEC_HAS_DLL == 1 */ -# define ROBOTMANAGER_EXEC_Export -# define ROBOTMANAGER_EXEC_SINGLETON_DECLARATION(T) -# define ROBOTMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ROBOTMANAGER_EXEC_HAS_DLL == 1 */ - -// Set ROBOTMANAGER_EXEC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ROBOTMANAGER_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define ROBOTMANAGER_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ROBOTMANAGER_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ROBOTMANAGER_EXEC_NTRACE */ - -#if (ROBOTMANAGER_EXEC_NTRACE == 1) -# define ROBOTMANAGER_EXEC_TRACE(X) -#else /* (ROBOTMANAGER_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ROBOTMANAGER_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ROBOTMANAGER_EXEC_NTRACE == 1) */ - -#endif /* ROBOTMANAGER_EXEC_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_stub_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_stub_export.h deleted file mode 100644 index c34d3efb41c..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ROBOTMANAGER_STUB -// ------------------------------ -#ifndef ROBOTMANAGER_STUB_EXPORT_H -#define ROBOTMANAGER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ROBOTMANAGER_STUB_HAS_DLL) -# define ROBOTMANAGER_STUB_HAS_DLL 1 -#endif /* ! ROBOTMANAGER_STUB_HAS_DLL */ - -#if defined (ROBOTMANAGER_STUB_HAS_DLL) && (ROBOTMANAGER_STUB_HAS_DLL == 1) -# if defined (ROBOTMANAGER_STUB_BUILD_DLL) -# define ROBOTMANAGER_STUB_Export ACE_Proper_Export_Flag -# define ROBOTMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ROBOTMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ROBOTMANAGER_STUB_BUILD_DLL */ -# define ROBOTMANAGER_STUB_Export ACE_Proper_Import_Flag -# define ROBOTMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ROBOTMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ROBOTMANAGER_STUB_BUILD_DLL */ -#else /* ROBOTMANAGER_STUB_HAS_DLL == 1 */ -# define ROBOTMANAGER_STUB_Export -# define ROBOTMANAGER_STUB_SINGLETON_DECLARATION(T) -# define ROBOTMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ROBOTMANAGER_STUB_HAS_DLL == 1 */ - -// Set ROBOTMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ROBOTMANAGER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define ROBOTMANAGER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ROBOTMANAGER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ROBOTMANAGER_STUB_NTRACE */ - -#if (ROBOTMANAGER_STUB_NTRACE == 1) -# define ROBOTMANAGER_STUB_TRACE(X) -#else /* (ROBOTMANAGER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ROBOTMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ROBOTMANAGER_STUB_NTRACE == 1) */ - -#endif /* ROBOTMANAGER_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_svnt_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_svnt_export.h deleted file mode 100644 index 1575b5179f3..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/RobotManager/RobotManager_svnt_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ROBOTMANAGER_SVNT -// ------------------------------ -#ifndef ROBOTMANAGER_SVNT_EXPORT_H -#define ROBOTMANAGER_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ROBOTMANAGER_SVNT_HAS_DLL) -# define ROBOTMANAGER_SVNT_HAS_DLL 1 -#endif /* ! ROBOTMANAGER_SVNT_HAS_DLL */ - -#if defined (ROBOTMANAGER_SVNT_HAS_DLL) && (ROBOTMANAGER_SVNT_HAS_DLL == 1) -# if defined (ROBOTMANAGER_SVNT_BUILD_DLL) -# define ROBOTMANAGER_SVNT_Export ACE_Proper_Export_Flag -# define ROBOTMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ROBOTMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ROBOTMANAGER_SVNT_BUILD_DLL */ -# define ROBOTMANAGER_SVNT_Export ACE_Proper_Import_Flag -# define ROBOTMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ROBOTMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ROBOTMANAGER_SVNT_BUILD_DLL */ -#else /* ROBOTMANAGER_SVNT_HAS_DLL == 1 */ -# define ROBOTMANAGER_SVNT_Export -# define ROBOTMANAGER_SVNT_SINGLETON_DECLARATION(T) -# define ROBOTMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ROBOTMANAGER_SVNT_HAS_DLL == 1 */ - -// Set ROBOTMANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ROBOTMANAGER_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define ROBOTMANAGER_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ROBOTMANAGER_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ROBOTMANAGER_SVNT_NTRACE */ - -#if (ROBOTMANAGER_SVNT_NTRACE == 1) -# define ROBOTMANAGER_SVNT_TRACE(X) -#else /* (ROBOTMANAGER_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ROBOTMANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ROBOTMANAGER_SVNT_NTRACE == 1) */ - -#endif /* ROBOTMANAGER_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/Robot_Base.idl b/TAO/CIAO/DnC/tests/RobotAssembly/Robot_Base.idl deleted file mode 100644 index e63bf19c820..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/Robot_Base.idl +++ /dev/null @@ -1,138 +0,0 @@ -// $Id$ -#include <Components.idl> - -module RobotAssembly -{ - - enum ProductionOrderType { - ProduceWhenReady, ProduceWhenConfirmed, ProductionConfirmation, ProductionAmended - }; - - enum StatusType { palletInPlace, palletProcessed, accepted, cancelled, complete, failed, ready, rejected, unacknowledged }; - - enum DisplayRequest { - DisplayWorkOrder, - DisplayWorkUpdate, - ReadytoProduce, - DisplayWorkProductionComplete, - DisplaySwitchProductionRobotRequest, - DisplayRadioFrequencyNeeded, - DisplayClearAreaPrompt, - DisplayProductionResumed - }; - - enum ProcessingOrderType { - Idle, BeginProcessingPallet, StopProcessingPallet, ResumeProduction, AbandonProduction - }; - - enum MoveRequestType { - BuiltInTestMessage, GetPalletProductToProcess, MovePalletToFinishingArea - }; - - enum DiscreteValue {low, high}; - - enum Discretes {palletPresent, palletReleaseSwitch, assemblyAreaIntrusion }; - - struct WorkOrder { - ProductionOrderType Order; - unsigned long OrderNumber; - unsigned long ProductNumber; - long Priority; - long Quantity; - }; - - struct ProductionStatusType { - unsigned long OrderNumber; - unsigned long ProductNumber; - StatusType Status; - long RequestedProduction; - long ActualProduction; - }; - - struct MovePalletRequestType { - MoveRequestType MoveRequest; - unsigned long OrderNumber; - unsigned long ProductNumber; - long JobPriority; - }; - -// 1e - eventtype ProductionWorkOrder { - public WorkOrder Order; - }; -//2e, 6e, 9e - eventtype DisplayWork { - public DisplayRequest Display; - public WorkOrder Order; - public StatusType Status; - }; - -// 3e, 12e - eventtype ProductionStatus { - public StatusType Status; - public WorkOrder Order; - }; - -// 4e, 10e - eventtype MovePalletRequest { - public MoveRequestType MoveRequest; - public WorkOrder Order; - }; - - -// 7e - eventtype ProcessPallet { - public ProcessingOrderType ProcessingOrder; - public WorkOrder Order; - }; - - -// 8e - eventtype PalletProcessingStatus { - public StatusType Status; - public WorkOrder Order; - }; - -// 5e, 11e - eventtype PalletStatusResponse { - public StatusType Status; - public WorkOrder Order; - }; - - interface MWIController - { - void SendOrder( in WorkOrder testOrder); - ProductionStatusType GetOrderStatus(); - string getHost(); - void SendStringTest (in string testString); - }; - - interface WorkOrderResponses { - void AcceptWorkOrderResponse(in WorkOrder Order, in StatusType Status); - void SetTimeResponse(in WorkOrder Order, in StatusType Status); - void AcceptFinalProductResponse(in WorkOrder Order, in StatusType Status); - }; - - interface HMIController { - string TextToDisplay(); - void KeyResponse( in short key); - string getHost(); - }; - - interface PCMController { - void SetDiscrete( in Discretes discrete); - DiscreteValue GetDiscreteStatus( in Discretes discrete); - MovePalletRequestType GetOrderStatus(); - void SetPalletStatus(); - string getHost(); - }; - - interface RMController { - void SetProcessingStatus(in ProcessingOrderType Status); - ProcessingOrderType GetProcessingStatus(); - string getHost(); - }; - -}; - - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.cidl b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.cidl deleted file mode 100644 index ea622c8bb82..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.cidl +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ -#include "WatchSettingManager.idl" - -composition session WatchSettingManager_Impl -{ - home executor WatchSettingManagerHome_Exec - { - implements RobotAssembly::WatchSettingManagerHome; - manages WatchSettingManager_Exec; - }; -}; - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.idl b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.idl deleted file mode 100644 index 503840c27ca..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ -#include "../Robot_Base.idl" - -module RobotAssembly -{ - component WatchSettingManager - { - //Production Interfaces - publishes DisplayWork Display; - publishes ProcessPallet ProductionControl; - publishes MovePalletRequest MovePallet; - publishes ProductionStatus ProductionReport; - consumes PalletProcessingStatus ProcessingStatus; - consumes PalletStatusResponse PalletStatus; - - provides WorkOrderResponses DisplayResponse; - consumes ProductionWorkOrder recvWorkOrder; - - }; - home WatchSettingManagerHome manages WatchSettingManager {}; - -}; - - diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.mpc b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.mpc deleted file mode 100644 index cdd02f44573..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.mpc +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -project(WatchSettingManager_stub): ciao_client_dnc { - after += RobotAssembly_stub - sharedname = WatchSettingManager_stub - libs += RobotAssembly_stub - idlflags += -Wb,stub_export_macro=WATCHSETTINGMANAGER_STUB_Export -Wb,stub_export_include=WatchSettingManager_stub_export.h -Wb,skel_export_macro=WATCHSETTINGMANAGER_SVNT_Export -Wb,skel_export_include=WatchSettingManager_svnt_export.h - dynamicflags = WATCHSETTINGMANAGER_STUB_BUILD_DLL - - IDL_Files { - WatchSettingManager.idl - } - - Source_Files { - WatchSettingManagerC.cpp - } -} - -project(WatchSettingManager_svnt) : ciao_servant_dnc { - after += WatchSettingManager_stub - sharedname = WatchSettingManager_svnt - libs += WatchSettingManager_stub RobotAssembly_stub RobotAssembly_svnt - - idlflags += -Wb,export_macro=WATCHSETTINGMANAGER_SVNT_Export -Wb,export_include=WatchSettingManager_svnt_export.h - dynamicflags = WATCHSETTINGMANAGER_SVNT_BUILD_DLL - - CIDL_Files { - WatchSettingManager.cidl - } - - IDL_Files { - WatchSettingManagerE.idl - } - - Source_Files { - WatchSettingManagerEC.cpp - WatchSettingManagerS.cpp - WatchSettingManager_svnt.cpp - } -} - -project(WatchSettingManager_exec) : ciao_component_dnc { - after += WatchSettingManager_svnt - sharedname = WatchSettingManager_exec - libs += RobotAssembly_stub RobotAssembly_svnt WatchSettingManager_stub WatchSettingManager_svnt - libpaths += .. - idlflags += -Wb,export_macro=WATCHSETTINGMANAGER_EXEC_Export -Wb,export_include=RobotManger_exec_export.h - dynamicflags = WATCHSETTINGMANAGER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WatchSettingManager_exec.cpp - } -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.cpp b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.cpp deleted file mode 100644 index f632d011569..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.cpp +++ /dev/null @@ -1,367 +0,0 @@ -//$Id$ -/* - * @file WatchSettingManager_exec.cpp - * - * @author Tao Lu <lu@dre.vanderbilt.edu> - */ - -#include "WatchSettingManager_exec.h" -#include "CIAO_common.h" - -WatchSettingManager_Impl::WatchSettingManager_exec_i::WatchSettingManager_exec_i () -{ -} - -WatchSettingManager_Impl::WatchSettingManager_exec_i::~WatchSettingManager_exec_i () -{ -} - - -RobotAssembly::CCM_WorkOrderResponses_ptr -WatchSettingManager_Impl::WatchSettingManager_exec_i::get_DisplayResponse (ACE_ENV_SINGLE_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_DEBUG ((LM_DEBUG, "WatchSettingManager_Impl::WatchSettingManager_exec.i::get_DisplayResponse called\n ")); - return (new WorkOrderResponses_Impl (*this)); -} - - - -// provides WorkOrderResponses DisplayResponse; -// void AcceptWorkOrderResponse(in WorkOrder Order, in StatusType Status); -// 1f -void -WatchSettingManager_Impl::WorkOrderResponses_Impl::AcceptWorkOrderResponse (const RobotAssembly::WorkOrder & Order, RobotAssembly::StatusType Status ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - printf("WatchSettingManager - In AcceptWorkOrderResponse (1f)\n"); - if (Status == RobotAssembly::accepted) { - printf("\tAccept work order Product\n"); - // eventtype ProductionStatus { - // public StatusType Status; - // public WorkOrder Order; - // }; - // Follow 3e - publishes ProductionStatus ProductionReport - RobotAssembly::ProductionStatus_var productionStatus_event = new OBV_RobotAssembly::ProductionStatus; - productionStatus_event->Order(Order); - productionStatus_event->Status(RobotAssembly::accepted); - this->component_.context_->push_ProductionReport(productionStatus_event ACE_ENV_ARG_PARAMETER); - - // eventtype MovePalletRequest { - // public MoveRequestType MoveRequest; - // public WorkOrder Order; - // }; - - // Follow 4e - publishes MovePalletRequest MovePallet - RobotAssembly::MovePalletRequest_var movePalletRequest_event = new OBV_RobotAssembly::MovePalletRequest; - movePalletRequest_event->Order(Order); - movePalletRequest_event->MoveRequest(RobotAssembly::GetPalletProductToProcess); - this->component_.context_->push_MovePallet(movePalletRequest_event ACE_ENV_ARG_PARAMETER); - - - } else if (Status == RobotAssembly::rejected) { - printf("\tReject work order Product\n"); - } else { - printf("\tInvalid response to Accept Work Order Question\n"); - } -} - -// void SetTimeResponse(in WorkOrder Order, in StatusType Status); -// 2f -void -WatchSettingManager_Impl::WorkOrderResponses_Impl::SetTimeResponse (const RobotAssembly::WorkOrder & Order, RobotAssembly::StatusType Status ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - printf("WatchSettingManager - In SetTimeResponse (2f)\n"); - if (Status == RobotAssembly::ready) { - printf("\tReady to set time\n"); - - // eventtype ProcessPallet { - // public ProcessingOrderType ProcessingOrder; - // public WorkOrder Order; - // }; - // Follow 7e - publishes ProcessPallet ProductionControl - RobotAssembly::ProcessPallet_var processPallet_event = new OBV_RobotAssembly::ProcessPallet; - processPallet_event->Order(Order); - processPallet_event->ProcessingOrder(RobotAssembly::BeginProcessingPallet); - this->component_.context_->push_ProductionControl(processPallet_event ACE_ENV_ARG_PARAMETER); - - } else if (Status == RobotAssembly::rejected) { - printf("\tRejected Setting the time\n"); - } else { - printf("\tInvalid response to Set Time Question\n"); - } -} - -// void AcceptFinalProductResponse(in WorkOrder, in StatusType Status); -// 3f -void -WatchSettingManager_Impl::WorkOrderResponses_Impl::AcceptFinalProductResponse (const RobotAssembly::WorkOrder & Order, RobotAssembly::StatusType Status ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - printf("WatchSettingManager - In AcceptFinalProductResponse (3f)\n"); - if (Status == RobotAssembly::complete) { - printf("\tAccept final Product\n"); - // eventtype MovePalletRequest { - // public MoveRequestType MoveRequest; - // public WorkOrder Order; - // }; - // Follow 10e - publishes MovePalletRequest MovePallet - RobotAssembly::MovePalletRequest_var movePalletRequest_event = new OBV_RobotAssembly::MovePalletRequest; - movePalletRequest_event->Order(Order); - movePalletRequest_event->MoveRequest(RobotAssembly::MovePalletToFinishingArea); - this->component_.context_->push_MovePallet(movePalletRequest_event ACE_ENV_ARG_PARAMETER); - - } else if (Status == RobotAssembly::rejected) { - printf("\tReject final Product\n"); - } else { - printf("\tInvalid response to Accept Final Product Question\n"); - } -} - - - - - - -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::push_recvWorkOrder (RobotAssembly::ProductionWorkOrder *ev - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - //Get the message from the Sender first. - ACE_DEBUG ((LM_DEBUG,"WatchSettingManager - In recvWorkOrder \n")); - - RobotAssembly::WorkOrder myWorkOrder = ev->Order(); - printf("Work Order Number %d, ProductNumber = %d\n", myWorkOrder.OrderNumber, myWorkOrder.ProductNumber); - - - - // RobotAssembly::ProductionWorkOrder_var event = new OBV_RobotAssembly::ProductionWorkOrder; - -// event->Order(testOrder); - -// this->component_.context_->push_sendWorkOrder(event ACE_ENV_ARG_PARAMETER); - - // Send work order to HMI to prompt user as to if it should be accepted - RobotAssembly::DisplayWork_var displayWork_event = new OBV_RobotAssembly::DisplayWork; - displayWork_event->Display(RobotAssembly::DisplayWorkOrder); - displayWork_event->Order(myWorkOrder); - displayWork_event->Status(RobotAssembly::unacknowledged); - // 2e - this->context_->push_Display(displayWork_event ACE_ENV_ARG_PARAMETER); -/* eventtype DisplayWork { - public DisplayRequest Display; - public WorkOrder Order; - public StatusType Status; - }; -*/ - -} - - -// consumes PalletProcessingStatus ProcessingStatus; -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::push_ProcessingStatus (RobotAssembly::PalletProcessingStatus *ev ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - - RobotAssembly::WorkOrder myWorkOrder = ev->Order(); - RobotAssembly::StatusType myStatus = ev->Status(); - // eventtype PalletProcessingStatus { - // public StatusType Status; - // public WorkOrder Order; - // }; - ACE_DEBUG ((LM_DEBUG, "WatchSettingManager - In push_ProcessingStatus event sink (8e) \n")); - // if (palletProcessed (call was 5e)) 9e - // eventtype DisplayWork { - // public DisplayRequest Display; - // public WorkOrder Order; - // public StatusType Status; - // }; - // 9e publishes DisplayWork Display; - RobotAssembly::DisplayWork_var displayWork_event = new OBV_RobotAssembly::DisplayWork; - displayWork_event->Display(RobotAssembly::DisplayWorkProductionComplete); - displayWork_event->Order(myWorkOrder); - displayWork_event->Status(RobotAssembly::ready); - this->context_->push_Display(displayWork_event ACE_ENV_ARG_PARAMETER); - -} -// consumes PalletStatusResponse PalletStatus; -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::push_PalletStatus (RobotAssembly::PalletStatusResponse *ev ACE_ENV_ARG_DECL) -ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // eventtype PalletStatusResponse { - // public StatusType Status; - // public WorkOrder Order; - // }; - RobotAssembly::WorkOrder myWorkOrder = ev->Order(); - RobotAssembly::StatusType myStatus = ev->Status(); - - ACE_DEBUG ((LM_DEBUG, "WatchSettingManager - In push_PalletStatus event sink \n")); - if (myStatus == RobotAssembly::palletInPlace) { - printf("\tStatus = palletInPlace (call was 5e)\n"); - // if (palletInPlace (call was 5e)) 6e - //6e - // eventtype DisplayWork { - // public DisplayRequest Display; - // public WorkOrder Order; - // public StatusType Status; - // }; - // 6e publishes DisplayWork Display; - RobotAssembly::DisplayWork_var displayWork_event = new OBV_RobotAssembly::DisplayWork; - displayWork_event->Display(RobotAssembly::ReadytoProduce); - displayWork_event->Order(myWorkOrder); - displayWork_event->Status(RobotAssembly::accepted); - this->context_->push_Display(displayWork_event ACE_ENV_ARG_PARAMETER); - - } else if (myStatus == RobotAssembly::complete) { - printf("\tStatus = complete (call was 11e)\n"); - // else if (complete(call was 11e)) 12e - // 12e - // eventtype ProductionStatus { - // public StatusType Status; - // public WorkOrder Order; - // }; - // 12e publishes ProductionStatus ProductionReport - RobotAssembly::ProductionStatus_var productionStatus_event = new OBV_RobotAssembly::ProductionStatus; - productionStatus_event->Order(myWorkOrder); - productionStatus_event->Status(RobotAssembly::complete); - this->context_->push_ProductionReport(productionStatus_event ACE_ENV_ARG_PARAMETER); - - } else { - printf("\tInvalid status value\n"); - } - - /* - - if (myMoveRequestType == RobotAssembly::GetPalletProductToProcess) { - // Simulate Pallet Ready - this code should be moved to the PCMController once the GUIs are attached - - // 5e - // publishes PalletStatusResponse PalletStatus; - RobotAssembly::PalletStatusResponse_var palletStatusResponse_event = new OBV_RobotAssembly::PalletStatusResponse; - palletStatusResponse_event->Order(myWorkOrder); - palletStatusResponse_event->Status(RobotAssembly::palletInPlace); - this->context_->push_PalletStatus(palletStatusResponse_event ACE_ENV_ARG_PARAMETER); - - } else if (myMoveRequestType == RobotAssembly::MovePalletToFinishingArea) { - // Simulate Pallet Ready - this code should be moved to the PCMController once the GUIs are attached - // eventtype PalletStatusResponse { - // public StatusType Status; - // public WorkOrder Order; - // }; - // 11e - // publishes PalletStatusResponse PalletStatus; - RobotAssembly::PalletStatusResponse_var palletStatusResponse_event = new OBV_RobotAssembly::PalletStatusResponse; - palletStatusResponse_event->Order(myWorkOrder); - palletStatusResponse_event->Status(RobotAssembly::palletProcessed); - this->context_->push_PalletStatus(palletStatusResponse_event ACE_ENV_ARG_PARAMETER); - - } - */ -} - - - -// Operations from Components::SessionComponen -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "WatchSettingManager_Impl::WatchSettingManager_exec_i::set_session_context\n")); - - this->context_ = - WatchSettingManager_Impl::WatchSettingManager_Exec_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); - // Urm, we actually discard exceptions thown from this operation. -} - -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, - "WatchSettingManager_Impl::WatchSettingManager_exec_i::ciao_preactivate\n")); -} - -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "WatchSettingManager_Impl::WatchSettingManager_exec_i::ccm_activate\n")); - - // @@ This hack work around a missing feature in CIAO's assembly - // mechanism where a Softpkg descriptor can specify it's dependency - // to a valuetype factory and instruct the deployment framework to - // initialize and register the corresponding valuefactory in the - // component server. Here, we are registering the valuefactory - // explicitly to work around this problem. - char *argv[1] = { "WatchSettingManager_exec"}; - int argc = sizeof(argv)/sizeof(argv[0]); - CORBA::ORB_var orb = CORBA::ORB_init (argc,argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CIAO_REGISTER_VALUE_FACTORY (orb.in(),RobotAssembly::ProductionWorkOrder_init, - RobotAssembly::ProductionWorkOrder); -} - -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, - "WatchSettingManager_Impl::WatchSettingManager_exec_i::ciao_postactivate\n")); -} - -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "WatchSettingManager_Impl::WatchSettingManager_exec_i::ccm_passivate\n")); -} - -void -WatchSettingManager_Impl::WatchSettingManager_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - ACE_DEBUG ((LM_DEBUG, "WatchSettingManager_Impl::WatchSettingManager_exec_i::ccm_remove\n")); -} - - -WatchSettingManager_Impl::WatchSettingManagerHome_exec_i::WatchSettingManagerHome_exec_i () -{ -} - -WatchSettingManager_Impl::WatchSettingManagerHome_exec_i::~WatchSettingManagerHome_exec_i () -{ -} - -::Components::EnterpriseComponent_ptr -WatchSettingManager_Impl::WatchSettingManagerHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)) -{ - Components::EnterpriseComponent_ptr tmp; - ACE_NEW_THROW_EX (tmp,WatchSettingManager_Impl::WatchSettingManager_exec_i, - CORBA::NO_MEMORY ()); - return tmp; -} - - -extern "C" WATCHSETTINGMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr -createWatchSettingManagerHome_Impl (void) -{ - return new WatchSettingManager_Impl::WatchSettingManagerHome_exec_i (); -} diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.h b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.h deleted file mode 100644 index 5dd43f9f062..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.h +++ /dev/null @@ -1,158 +0,0 @@ -//$Id$: -//============================================================ -/** -* @file WatchSettingManager_exec.h -* -* Header file for the Executor implementation. -* @author Tao Lu <lu@dre.vanderbilt.edu> -*/ -//============================================================ - -#ifndef WATCHSETTINGMANAGER_EXEC_H -#define WATCHSETTINGMANAGER_EXEC_H - -#include "WatchSettingManagerEC.h" -#include "WatchSettingManager_exec_export.h" -#include "tao/LocalObject.h" - -namespace WatchSettingManager_Impl -{ - -/** -* @class WatchSettingManager_exec_i -* -* WatchSettingManager executor implementation class. - */ - - class WATCHSETTINGMANAGER_EXEC_Export WatchSettingManager_exec_i : - public virtual WatchSettingManager_Exec, - public virtual TAO_Local_RefCounted_Object - { - - public: - /// Default constructor. - WatchSettingManager_exec_i (); - - /// Default destructor. - ~WatchSettingManager_exec_i (); - -// publishes DisplayWork Display; -// publishes ProcessPallet ProductionControl; -// publishes MovePalletRequest MovePallet; -// publishes ProductionStatus ProductionReport; - - -// provides WorkOrderResponses DisplayResponse; - - - virtual RobotAssembly::CCM_WorkOrderResponses_ptr get_DisplayResponse (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -// consumes ProductionWorkOrder recvWorkOrder; - virtual void - push_recvWorkOrder (RobotAssembly::ProductionWorkOrder *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); -// consumes PalletProcessingStatus ProcessingStatus; - virtual void - push_ProcessingStatus (RobotAssembly::PalletProcessingStatus *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); -// consumes PalletStatusResponse PalletStatus; - virtual void - push_PalletStatus (RobotAssembly::PalletStatusResponse *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - - virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - - protected: - /// Copmponent specific context - WatchSettingManager_Exec_Context_var context_; - friend class WorkOrderResponses_Impl; - }; - - // provides WorkOrderResponses DisplayResponse; - class WorkOrderResponses_Impl : public virtual RobotAssembly::CCM_WorkOrderResponses, - public virtual TAO_Local_RefCounted_Object - { - public: - WorkOrderResponses_Impl(WatchSettingManager_exec_i& component) : component_ (component) - { } - - // 1f - // void AcceptWorkOrderResponse(in WorkOrder Order, in StatusType Status); - virtual void AcceptWorkOrderResponse(const RobotAssembly::WorkOrder & Order, RobotAssembly::StatusType Status ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // 2f - // void SetTimeResponse(in WorkOrder Order, in StatusType Status); - virtual void SetTimeResponse (const RobotAssembly::WorkOrder & Order, RobotAssembly::StatusType Status ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - // 3f - // void AcceptFinalProductResponse(in WorkOrder, in StatusType Status); - virtual void AcceptFinalProductResponse (const RobotAssembly::WorkOrder & Order,::RobotAssembly::StatusType Status ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - - private: - WatchSettingManager_exec_i& component_; - }; - - - /** - * @class WatchSettingManagerHome_exec_i - * - * WatchSettingManager home executor implementation class. - */ - class WATCHSETTINGMANAGER_EXEC_Export WatchSettingManagerHome_exec_i : - public virtual WatchSettingManagerHome_Exec, - public virtual TAO_Local_RefCounted_Object - { - public: - /// Default ctor. - WatchSettingManagerHome_exec_i (); - - /// Default dtor. - ~WatchSettingManagerHome_exec_i (); - - // Implicit home operations. - - virtual ::Components::EnterpriseComponent_ptr - create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Components::CCMException)); - }; - -} - -extern "C" WATCHSETTINGMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr -createWatchSettingManagerHome_Impl (void); - -#endif /* WATCHSETTINGMANAGER_EXEC_H */ diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec_export.h deleted file mode 100644 index 1ce8dc5e841..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl WATCHSETTINGMANAGER_EXEC -// ------------------------------ -#ifndef WATCHSETTINGMANAGER_EXEC_EXPORT_H -#define WATCHSETTINGMANAGER_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (WATCHSETTINGMANAGER_EXEC_HAS_DLL) -# define WATCHSETTINGMANAGER_EXEC_HAS_DLL 1 -#endif /* ! WATCHSETTINGMANAGER_EXEC_HAS_DLL */ - -#if defined (WATCHSETTINGMANAGER_EXEC_HAS_DLL) && (WATCHSETTINGMANAGER_EXEC_HAS_DLL == 1) -# if defined (WATCHSETTINGMANAGER_EXEC_BUILD_DLL) -# define WATCHSETTINGMANAGER_EXEC_Export ACE_Proper_Export_Flag -# define WATCHSETTINGMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define WATCHSETTINGMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* WATCHSETTINGMANAGER_EXEC_BUILD_DLL */ -# define WATCHSETTINGMANAGER_EXEC_Export ACE_Proper_Import_Flag -# define WATCHSETTINGMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define WATCHSETTINGMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* WATCHSETTINGMANAGER_EXEC_BUILD_DLL */ -#else /* WATCHSETTINGMANAGER_EXEC_HAS_DLL == 1 */ -# define WATCHSETTINGMANAGER_EXEC_Export -# define WATCHSETTINGMANAGER_EXEC_SINGLETON_DECLARATION(T) -# define WATCHSETTINGMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* WATCHSETTINGMANAGER_EXEC_HAS_DLL == 1 */ - -// Set WATCHSETTINGMANAGER_EXEC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (WATCHSETTINGMANAGER_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define WATCHSETTINGMANAGER_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define WATCHSETTINGMANAGER_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !WATCHSETTINGMANAGER_EXEC_NTRACE */ - -#if (WATCHSETTINGMANAGER_EXEC_NTRACE == 1) -# define WATCHSETTINGMANAGER_EXEC_TRACE(X) -#else /* (WATCHSETTINGMANAGER_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define WATCHSETTINGMANAGER_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (WATCHSETTINGMANAGER_EXEC_NTRACE == 1) */ - -#endif /* WATCHSETTINGMANAGER_EXEC_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_stub_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_stub_export.h deleted file mode 100644 index 2e53d21261b..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_stub_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl WATCHSETTINGMANAGER_STUB -// ------------------------------ -#ifndef WATCHSETTINGMANAGER_STUB_EXPORT_H -#define WATCHSETTINGMANAGER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (WATCHSETTINGMANAGER_STUB_HAS_DLL) -# define WATCHSETTINGMANAGER_STUB_HAS_DLL 1 -#endif /* ! WATCHSETTINGMANAGER_STUB_HAS_DLL */ - -#if defined (WATCHSETTINGMANAGER_STUB_HAS_DLL) && (WATCHSETTINGMANAGER_STUB_HAS_DLL == 1) -# if defined (WATCHSETTINGMANAGER_STUB_BUILD_DLL) -# define WATCHSETTINGMANAGER_STUB_Export ACE_Proper_Export_Flag -# define WATCHSETTINGMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define WATCHSETTINGMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* WATCHSETTINGMANAGER_STUB_BUILD_DLL */ -# define WATCHSETTINGMANAGER_STUB_Export ACE_Proper_Import_Flag -# define WATCHSETTINGMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define WATCHSETTINGMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* WATCHSETTINGMANAGER_STUB_BUILD_DLL */ -#else /* WATCHSETTINGMANAGER_STUB_HAS_DLL == 1 */ -# define WATCHSETTINGMANAGER_STUB_Export -# define WATCHSETTINGMANAGER_STUB_SINGLETON_DECLARATION(T) -# define WATCHSETTINGMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* WATCHSETTINGMANAGER_STUB_HAS_DLL == 1 */ - -// Set WATCHSETTINGMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (WATCHSETTINGMANAGER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define WATCHSETTINGMANAGER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define WATCHSETTINGMANAGER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !WATCHSETTINGMANAGER_STUB_NTRACE */ - -#if (WATCHSETTINGMANAGER_STUB_NTRACE == 1) -# define WATCHSETTINGMANAGER_STUB_TRACE(X) -#else /* (WATCHSETTINGMANAGER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define WATCHSETTINGMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (WATCHSETTINGMANAGER_STUB_NTRACE == 1) */ - -#endif /* WATCHSETTINGMANAGER_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_svnt_export.h b/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_svnt_export.h deleted file mode 100644 index dd64ee76464..00000000000 --- a/TAO/CIAO/DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_svnt_export.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl WATCHSETTINGMANAGER_SVNT -// ------------------------------ -#ifndef WATCHSETTINGMANAGER_SVNT_EXPORT_H -#define WATCHSETTINGMANAGER_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (WATCHSETTINGMANAGER_SVNT_HAS_DLL) -# define WATCHSETTINGMANAGER_SVNT_HAS_DLL 1 -#endif /* ! WATCHSETTINGMANAGER_SVNT_HAS_DLL */ - -#if defined (WATCHSETTINGMANAGER_SVNT_HAS_DLL) && (WATCHSETTINGMANAGER_SVNT_HAS_DLL == 1) -# if defined (WATCHSETTINGMANAGER_SVNT_BUILD_DLL) -# define WATCHSETTINGMANAGER_SVNT_Export ACE_Proper_Export_Flag -# define WATCHSETTINGMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define WATCHSETTINGMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* WATCHSETTINGMANAGER_SVNT_BUILD_DLL */ -# define WATCHSETTINGMANAGER_SVNT_Export ACE_Proper_Import_Flag -# define WATCHSETTINGMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define WATCHSETTINGMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* WATCHSETTINGMANAGER_SVNT_BUILD_DLL */ -#else /* WATCHSETTINGMANAGER_SVNT_HAS_DLL == 1 */ -# define WATCHSETTINGMANAGER_SVNT_Export -# define WATCHSETTINGMANAGER_SVNT_SINGLETON_DECLARATION(T) -# define WATCHSETTINGMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* WATCHSETTINGMANAGER_SVNT_HAS_DLL == 1 */ - -// Set WATCHSETTINGMANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (WATCHSETTINGMANAGER_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define WATCHSETTINGMANAGER_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define WATCHSETTINGMANAGER_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !WATCHSETTINGMANAGER_SVNT_NTRACE */ - -#if (WATCHSETTINGMANAGER_SVNT_NTRACE == 1) -# define WATCHSETTINGMANAGER_SVNT_TRACE(X) -#else /* (WATCHSETTINGMANAGER_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define WATCHSETTINGMANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (WATCHSETTINGMANAGER_SVNT_NTRACE == 1) */ - -#endif /* WATCHSETTINGMANAGER_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/CIAO/DnC/tests/scripts/BasicSP/basicNodeDaemon.pl b/TAO/CIAO/DnC/tests/scripts/BasicSP/basicNodeDaemon.pl deleted file mode 100644 index 74b4ad3dfd3..00000000000 --- a/TAO/CIAO/DnC/tests/scripts/BasicSP/basicNodeDaemon.pl +++ /dev/null @@ -1,57 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "../../../../../../bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile1 = PerlACE::LocalFile ("NodeApp1.ior"); -$iorfile2 = PerlACE::LocalFile ("NodeApp2.ior"); -$iorfile3 = PerlACE::LocalFile ("NodeApp3.ior"); -$iorfile4 = PerlACE::LocalFile ("NodeApp4.ior"); -$iorfile5 = PerlACE::LocalFile ("NodeApp5.ior"); - -#for ($iter = 0; $iter <= $#ARGV; $iter++) { -# if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { -# print "Run_Test Perl script for NodeApplicationTest \n\n"; -# print "run_test \n"; -# print "\n"; -# print "-h -- prints this information\n"; -# exit 0; -# } -#} - - -unlink $iorfile1; -unlink $iorfile2; -unlink $iorfile3; -unlink $iorfile4; -unlink $iorfile5; - -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV1 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV2 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:20000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV3 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV4 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV5 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); -$SV1->Spawn (); -$SV2->Spawn (); -$SV3->Spawn (); -$SV4->Spawn (); -$SV5->Spawn (); - -sleep (99999999999); diff --git a/TAO/CIAO/DnC/tests/scripts/BasicSP/basicsp.dat b/TAO/CIAO/DnC/tests/scripts/BasicSP/basicsp.dat deleted file mode 100644 index 8bd5e6a72f6..00000000000 --- a/TAO/CIAO/DnC/tests/scripts/BasicSP/basicsp.dat +++ /dev/null @@ -1,3 +0,0 @@ -BMClosedED corbaloc:iiop:localhost:10000/NodeManager -EC corbaloc:iiop:localhost:20000/NodeManager - diff --git a/TAO/CIAO/DnC/tests/scripts/RobotAssembly/robotNodeDaemon.pl b/TAO/CIAO/DnC/tests/scripts/RobotAssembly/robotNodeDaemon.pl deleted file mode 100644 index 74b4ad3dfd3..00000000000 --- a/TAO/CIAO/DnC/tests/scripts/RobotAssembly/robotNodeDaemon.pl +++ /dev/null @@ -1,57 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "../../../../../../bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile1 = PerlACE::LocalFile ("NodeApp1.ior"); -$iorfile2 = PerlACE::LocalFile ("NodeApp2.ior"); -$iorfile3 = PerlACE::LocalFile ("NodeApp3.ior"); -$iorfile4 = PerlACE::LocalFile ("NodeApp4.ior"); -$iorfile5 = PerlACE::LocalFile ("NodeApp5.ior"); - -#for ($iter = 0; $iter <= $#ARGV; $iter++) { -# if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { -# print "Run_Test Perl script for NodeApplicationTest \n\n"; -# print "run_test \n"; -# print "\n"; -# print "-h -- prints this information\n"; -# exit 0; -# } -#} - - -unlink $iorfile1; -unlink $iorfile2; -unlink $iorfile3; -unlink $iorfile4; -unlink $iorfile5; - -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV1 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV2 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:20000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV3 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV4 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); - -$SV5 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon", - "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication"); -$SV1->Spawn (); -$SV2->Spawn (); -$SV3->Spawn (); -$SV4->Spawn (); -$SV5->Spawn (); - -sleep (99999999999); diff --git a/TAO/CIAO/DnC/tests/scripts/RobotAssembly/robotassembly.dat b/TAO/CIAO/DnC/tests/scripts/RobotAssembly/robotassembly.dat deleted file mode 100644 index 0eb549ebe16..00000000000 --- a/TAO/CIAO/DnC/tests/scripts/RobotAssembly/robotassembly.dat +++ /dev/null @@ -1,3 +0,0 @@ -WindowsXP corbaloc:iiop:localhost:10000/NodeManager -RedHatLinux corbaloc:iiop:localhost:20000/NodeManager - |