move pluginlib in its own folder (port 83 to ros2 branch)

CMakeLists.txt → pluginlib/CMakeLists.txt

@@ -58,7 +58,7 @@ install(
 #   endif()
 
 #   include(CheckCXXCompilerFlag)
-#   CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+#   check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
 #   if(COMPILER_SUPPORTS_CXX11)
 #     catkin_add_gtest(${PROJECT_NAME}_unique_ptr_test test/unique_ptr_test.cpp)
 #     if(TARGET ${PROJECT_NAME}_unique_ptr_test)

cmake/pluginlib_export_plugin_description_file.cmake → pluginlib/cmake/pluginlib_export_plugin_description_file.cmake

@@ -69,7 +69,7 @@ set(__PLUGINLIB_PLUGIN_CATEGORIES "")
 #   pluginlib_export_plugin_description_file(rviz "plugin_description.xml")
 #
 # This macro assumes the package name is PROJECT_NAME.
-# 
+#
 # :param plugin_category: category for the type of plugin described; used at
 #   runtime to locate all description files for that kind of plugin
 # :type plugin_category: string

cmake/pluginlib_package_hook.cmake → pluginlib/cmake/pluginlib_package_hook.cmake

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# install the ament resource for the plugin descriptions exported by this package
+# install the ament resource for the plugin descriptions exported by
+# this package
 list(REMOVE_DUPLICATES __PLUGINLIB_PLUGIN_CATEGORIES)
 foreach(plugin_category ${__PLUGINLIB_PLUGIN_CATEGORIES})
   # this assumes PROJECT_NAME is the package name

include/pluginlib/class_loader_imp.hpp → pluginlib/include/pluginlib/class_loader_imp.hpp

@@ -316,7 +316,13 @@ std::map<std::string, ClassDesc> ClassLoader<T>::determineAvailableClasses(
   for (std::vector<std::string>::const_iterator it = plugin_xml_paths.begin();
     it != plugin_xml_paths.end(); ++it)
   {
-    processSingleXMLPluginFile(*it, classes_available);
+    try {
+      processSingleXMLPluginFile(*it, classes_available);
+    } catch (const pluginlib::InvalidXMLException & e) {
+      RCUTILS_LOG_ERROR_NAMED("pluginlib.ClassLoader",
+        "Skipped loading plugin with error: %s.",
+        e.what());
+    }
   }
 
   RCUTILS_LOG_DEBUG_NAMED("pluginlib.ClassLoader", "Exiting determineAvailableClasses()...");
@@ -670,15 +676,15 @@ void ClassLoader<T>::processSingleXMLPluginFile(
   tinyxml2::XMLElement * config = document.RootElement();
   if (NULL == config) {
     throw pluginlib::InvalidXMLException(
-            "XML Document has no Root Element. "
-            "This likely means the XML is malformed or missing.");
+            "XML Document '" + xml_file +
+            "' has no Root Element. This likely means the XML is malformed or missing.");
     return;
   }
   if (!(strcmp(config->Value(), "library") == 0 ||
     strcmp(config->Value(), "class_libraries") == 0))
   {
     throw pluginlib::InvalidXMLException(
-            "The XML document given to add must have either \"library\" or "
+            "The XML document '" + xml_file + "' given to add must have either \"library\" or "
             "\"class_libraries\" as the root tag");
     return;
   }

include/pluginlib/exceptions.hpp → pluginlib/include/pluginlib/exceptions.hpp

@@ -47,7 +47,7 @@ class PluginlibException : public std::runtime_error
   : std::runtime_error(error_desc) {}
 };
 
-/// An exception class thrown when pluginlib is unable to load a plugin XML file.
+/// Thrown when pluginlib is unable to load a plugin XML file.
 /**
  * \class InvalidXMLException
  */
@@ -58,7 +58,7 @@ class InvalidXMLException : public PluginlibException
   : PluginlibException(error_desc) {}
 };
 
-/// An exception class thrown when pluginlib is unable to load the library associated with a given plugin.
+/// Thrown when pluginlib is unable to load the library associated with a given plugin.
 /**
  * \class LibraryLoadException
  */
@@ -69,7 +69,7 @@ class LibraryLoadException : public PluginlibException
   : PluginlibException(error_desc) {}
 };
 
-/// An exception class thrown when pluginlib is unable to instantiate a class loader.
+/// Thrown when pluginlib is unable to instantiate a class loader.
 /**
  * \class ClassLoaderException
  */
@@ -80,7 +80,7 @@ class ClassLoaderException : public PluginlibException
   : PluginlibException(error_desc) {}
 };
 
-/// An exception class thrown when pluginlib is unable to unload the library associated with a given plugin.
+/// Thrown when pluginlib is unable to unload the library associated with a given plugin.
 /**
  * \class LibraryUnloadException
  */
@@ -91,7 +91,7 @@ class LibraryUnloadException : public PluginlibException
   : PluginlibException(error_desc) {}
 };
 
-/// An exception class thrown when pluginlib is unable to create the class associated with a given plugin.
+/// Thrown when pluginlib is unable to create the class associated with a given plugin.
 /**
  * \class CreateClassException
  */

include/pluginlib/impl/filesystem_helper.hpp → pluginlib/include/pluginlib/impl/filesystem_helper.hpp

@@ -67,6 +67,7 @@ namespace fs = std::experimental::filesystem;
 #ifndef PLUGINLIB__IMPL__FILESYSYEM_HELPER__HAS_STD_FILESYSTEM
 
 #include <string>
+#include <vector>
 
 #ifdef _WIN32
 #define CLASS_LOADER_IMPL_OS_DIRSEP '\\'

include/pluginlib/impl/split.hpp → pluginlib/include/pluginlib/impl/split.hpp

@@ -40,7 +40,8 @@ namespace impl
 {
 
 inline std::vector<std::string>
-split(const std::string & input, const std::string & regex) {
+split(const std::string & input, const std::string & regex)
+{
   std::regex re(regex);
   // the -1 will cause this to return the stuff between the matches, see the submatch argument:
   //   http://en.cppreference.com/w/cpp/regex/regex_token_iterator/regex_token_iterator

test/test_plugins.cpp → pluginlib/test/test_plugins.cpp

@@ -29,7 +29,7 @@
 
 #include <pluginlib/class_list_macros.hpp>
 #include "./test_base.h"
-#include "./test_plugins.h"
+#include "test_plugins.h"  // NOLINT
 
 PLUGINLIB_EXPORT_CLASS(test_plugins::Foo, test_base::Fubar)
 PLUGINLIB_EXPORT_CLASS(test_plugins::Bar, test_base::Fubar)

test/utest.cpp → pluginlib/test/utest.cpp

@@ -29,7 +29,8 @@
 
 #include <gtest/gtest.h>
 
-#include <pluginlib/class_loader.hpp>
+#include <memory>
+#include <pluginlib/class_loader.hpp>  // NOLINT
 
 #include "./test_base.h"
 
@@ -123,7 +124,8 @@ TEST(PluginlibTest, brokenXML) {
   try {
     pluginlib::ClassLoader<test_base::Fubar> test_loader("pluginlib", "test_base::Fubar",
       "plugin_test");
-  } catch (pluginlib::InvalidXMLException & ex) {
+    test_loader.createInstance("pluginlib/foo");
+  } catch (pluginlib::PluginlibException & ex) {
     SUCCEED();
     return;
   }