---
deployment/DeploymentComponent.cpp | 12 ++++++------
deployment/DeploymentComponent.hpp | 34 ++++++++++++++++++----------------
2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/deployment/DeploymentComponent.cpp b/deployment/DeploymentComponent.cpp
index 7f491d4..54f4a94 100644
--- a/deployment/DeploymentComponent.cpp
+++ b/deployment/DeploymentComponent.cpp
@@ -134,15 +134,15 @@ namespace OCL
this->methods()->addMethod( RTT::method("kickStart", &DeploymentComponent::kickStart, this),
"Calls loadComponents, configureComponents and startComponents in a row.",
"File", "The file which contains the XML configuration to use.");
- this->methods()->addMethod( RTT::method("kickOut", &DeploymentComponent::kickOut, this),
+ this->methods()->addMethod( RTT::method("kickOutAll", &DeploymentComponent::kickOutAll, this),
"Calls stopComponents, cleanupComponents and unloadComponents in a row.");

this->methods()->addMethod( RTT::method("kickOutComponent", &DeploymentComponent::kickOutComponent, this),
"Calls stopComponents, cleanupComponent and unloadComponent in a row.",
"comp_name", "component name");
- this->methods()->addMethod( RTT::method("kickOutFile", &DeploymentComponent::kickOutFile, this),
+ this->methods()->addMethod( RTT::method("kickOut", &DeploymentComponent::kickOut, this),
"Calls stopComponents, cleanupComponents and unloadComponents in a row.",
- "File", "The file which contains the name of the components to kickOut (the same used in loadComponents, if you want).");
+ "File", "The file which contains the name of the components to kickOut (for example, the same used in kickStart).");

// Work around compiler ambiguity:
typedef bool(DeploymentComponent::*DCFun)(const std::string&, const std::string&);
@@ -377,7 +377,7 @@ namespace OCL
return false;
}

- bool DeploymentComponent::kickOut()
+ bool DeploymentComponent::kickOutAll()
{
bool sret = this->stopComponents();
bool cret = this->cleanupComponents();
@@ -1671,9 +1671,9 @@ namespace OCL
return ComponentFactories::Instance();
}

- void DeploymentComponent::kickOutFile(const std::string& config_file)
+ void DeploymentComponent::kickOut(const std::string& config_file)
{
- Logger::In in("DeploymentComponent::kickOutFile");
+ Logger::In in("DeploymentComponent::kickOut");
PropertyBag from_file;
Property import_file;
std::vector deleted_components_type;
diff --git a/deployment/DeploymentComponent.hpp b/deployment/DeploymentComponent.hpp
index ce7ef21..52f6c43 100644
--- a/deployment/DeploymentComponent.hpp
+++ b/deployment/DeploymentComponent.hpp
@@ -77,7 +77,7 @@ namespace OCL
: instance(0), act(0), loaded(false),
autostart(false), autoconf(false),
autoconnect(false), proxy(false), server(false),
- use_naming(true),type("")
+ use_naming(true),type("")
{}
/**
* The component instance. This is always a valid pointer.
@@ -96,7 +96,7 @@ namespace OCL
bool loaded;
bool autostart, autoconf, autoconnect;
bool proxy, server, use_naming;
- std::string type;
+ std::string type;
};

/**
@@ -424,9 +424,23 @@ namespace OCL
bool kickStart(const std::string& file_name);

/**
- * Stop, cleanup and unload all components which were loaded by this component.
+ * Stop, cleanup and unload a single component which were loaded by this component.
+ * @param comp_name name of the component.
+ * @return true if successfully stopped, cleaned and unloaded
+ */
+ bool kickOutComponent(const std::string& comp_name);
+
+ /**
+ * Identical to \a kickOutAll, but it reads the name of the Components to kickOut from an XML file.
+ * @param config_file name of an XML file (probably the same used by loadComponents() or kickStart() ).
+ */
+ void kickOut(const std::string& config_file);
+
+ /**
+ * Stop, cleanup and unload all components loaded by the DeploymentComponent.
*/
- bool kickOut();
+ bool kickOutAll();
+

using TaskCore::configure;

@@ -515,18 +529,6 @@ namespace OCL
return this->cleanupComponent( this->getPeer(comp_name) );
}

- /**
- * Stop, cleanup and unload a single component which were loaded by this component.
- * @param comp_name name of the component.
- * @return true if successfully stopped, cleaned and unloaded
- */
- bool kickOutComponent(const std::string& comp_name);
-
- /**
- * Identical to \a kickOut, but it read the name of the Components to kickOut from a XML file
- * @param config_file name of an XML file (probably the same used by loadComponents() ).
- */
- void kickOutFile(const std::string& config_file);
};