Remove outstanding ocurrences of ACore/ANode/AParser

libs/base/src/ecflow/base/Gnuplot.cpp

@@ -339,7 +339,7 @@ bool Gnuplot::extract_suite_path(const std::string& line,
         if (child_cmd) {
 
             // For labels ignore paths in the label part
-            // MSG:[14:55:04 17.10.2013] chd:label progress 'core/nodeattr/nodeAParser'
+            // MSG:[14:55:04 17.10.2013] chd:label progress 'core/nodeattr/node/parser'
             // /suite/build/cray/cray_gnu/build_release/test
             if (line.find("chd:label") != std::string::npos) {
                 size_t last_tick = line.rfind("'");

libs/client/test/TestClientTimeout.cpp

@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(test_client_timeout, *boost::unit_test::disabled()) {
     ClientInvoker theClient(invokeServer.host(), invokeServer.port());
     theClient.set_connect_timeout(0);
 
-    std::string path = File::test_data("ANode/test/parser/data/single_defs/mega.def", "parser");
+    std::string path = File::test_data("libs/node/test/parser/data/single_defs/mega.def", "parser");
     BOOST_REQUIRE_THROW(theClient.loadDefs(path),
                         std::runtime_error); // Expect load defs to fail with a timeout of 1 second
 

libs/core/src/ecflow/core/Str.cpp

@@ -279,7 +279,7 @@ void Str::split(const std::string& line, std::vector<std::string>& tokens, const
     //   Time for std::string_view 1000000            times = 0.769s wall, (0.770s user + 0.000s system = 0.770s) CPU
     //   (100.1%) Time for std::string_view(2) 1000000         times = 0.688s wall, (0.690s user + 0.000s system =
     //   0.690s) CPU (100.3%)
-    //  ACore:: ...test_str_split_perf_with_file
+    //  core :: test_str_split_perf_with_file
     //   This test will split each line in file ${ECF_TEST_DEFS_DIR}vsms2.31415.def
     //   Time for istreamstream 2001774                 times = 1.567s wall, (1.570s user + 0.000s system = 1.570s) CPU
     //   (100.2%) Time for std::getline 2001774                  times = 2.456s wall, (2.460s user + 0.000s system

libs/core/src/ecflow/core/Version.cpp

@@ -23,9 +23,9 @@ namespace ecf {
 // ********************************************************************
 // IMPORTANT:
 // The version number is extracted externally.
-//   see ACore/doc/extracting_version_number.ddoc
+//   see libs/core/doc/extracting_version_number.ddoc
 //
-//   See ACore/src/ecflow_version.h
+//   See libs/core/src/ecflow_version.h
 //   This file is generated when cmake is run, i.e.
 //     `sh -x $WK/cmake.sh debug`
 //

libs/core/test/TestCerealWithHierarchy.cpp

@@ -126,14 +126,14 @@ BOOST_AUTO_TEST_CASE(test_cereal_save_as_string_and_save_as_filename) {
 
     // SAVE as string and file
     {
-        BOOST_REQUIRE_NO_THROW(ecf::save("ACore.txt", originalCmd)); // save as filename
+        BOOST_REQUIRE_NO_THROW(ecf::save("core.txt", originalCmd)); // save as filename
         ecf::save_as_string(saved_cmd_as_string, originalCmd); // save as string, this is buggy forgets trailing '}'
     }
 
     // RESTORE from filename and string
     {
         CmdContainer restoredCmd;
-        BOOST_REQUIRE_NO_THROW(ecf::restore("ACore.txt", restoredCmd)); // restore from filename
+        BOOST_REQUIRE_NO_THROW(ecf::restore("core.txt", restoredCmd)); // restore from filename
         BOOST_REQUIRE_MESSAGE(restoredCmd == originalCmd,
                               "restoredCmd " << restoredCmd << "  originalCmd " << originalCmd);
     }
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(test_cereal_save_as_string_and_save_as_filename) {
                               "restoredCmd " << restoredCmd << "  originalCmd " << originalCmd);
     }
 
-    fs::remove("ACore.txt");
+    fs::remove("core.txt");
 }
 
 BOOST_AUTO_TEST_SUITE_END()

libs/core/test/TestFile.cpp

@@ -189,7 +189,7 @@ BOOST_AUTO_TEST_CASE(test_file_backwardSearch) {
         path += "/" + dir + ecf::convert_to<std::string>(i);
     }
     // Should have test/data/dir0/dir1/dir3/dir3/dir4/dir5
-    //         or  ACore/test/data/dir0/dir1/dir3/dir3/dir4/dir5
+    //         or  libs/core/test/data/dir0/dir1/dir3/dir3/dir4/dir5
     BOOST_REQUIRE_MESSAGE(path == expected, " Error expected " << expected << " but found " << path);
 
     // Create the missing directories
@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE(test_file_forwardSearch) {
             path += "/" + dir + ecf::convert_to<std::string>(i);
     }
     // Should have test/data/dir0/dir1/dir3/dir3/dir4/task
-    //         or  ACore/test/data/dir0/dir1/dir3/dir3/dir4/task
+    //         or  libs/core/test/data/dir0/dir1/dir3/dir3/dir4/task
     BOOST_REQUIRE_MESSAGE(path == expected, " Error expected " << expected << " but found " << path);
 
     string combined_dir_path = rootPath + dir_path;
@@ -342,7 +342,7 @@ BOOST_AUTO_TEST_CASE(test_create_missing_directories) {
 
     std::string dir_remove = rootPath + "/dir0";
     {
-        // Test basics first, expect "ACore/test/data/dir0/dir1/dir2/dir3/dir4/dir5" to be created
+        // Test basics first, expect "libs/core/test/data/dir0/dir1/dir2/dir3/dir4/dir5" to be created
         BOOST_CHECK_MESSAGE(File::createMissingDirectories(expected),
                             expected << " expected directories to be created");
         BOOST_CHECK_MESSAGE(fs::exists(expected), expected << " directory not created");
@@ -361,7 +361,7 @@ BOOST_AUTO_TEST_CASE(test_create_missing_directories) {
         //      std::cout << "extension " << fs_path.extension()  << "\n";
     }
     {
-        // Test "ACore/test/data/dir0/dir1/dir2/dir3/dir4/dir5/fred.ecf" to be created
+        // Test "libs/core/test/data/dir0/dir1/dir2/dir3/dir4/dir5/fred.ecf" to be created
         std::string dir_with_file = expected + "/fred.ecf";
         BOOST_CHECK_MESSAGE(File::createMissingDirectories(dir_with_file),
                             "Expected '" << dir_with_file << "' to be created");

libs/core/test/TestVersion.cpp

@@ -70,8 +70,9 @@ BOOST_AUTO_TEST_CASE(test_version_against_cmake) {
                               << version_cmake_file);
     BOOST_REQUIRE_MESSAGE(
         Version::raw() == cmake_version,
-        "\n  Expected " << cmake_version << " but found " << Version::raw()
-                        << ", Please regenerate file $WK/ACore/src/ecflow_version.h by calling 'sh -x $WK/cmake.sh'");
+        "\n  Expected "
+            << cmake_version << " but found " << Version::raw()
+            << ", Please regenerate file $WK/libs/core/src/ecflow_version.h by calling 'sh -x $WK/cmake.sh'");
 }
 
 BOOST_AUTO_TEST_SUITE_END()

libs/pyext/migrate/py_u_TestMigrate.py

@@ -29,7 +29,7 @@ def get_root_source_dir():
             if os.path.exists(file):
                 # determine path by looking into this file:
                 for line in open(file):
-                    ## Source directory: /tmp/ma0/workspace/ecflow/ACore
+                    ## Source directory: /tmp/ma0/workspace/ecflow/libs/core
                     if line.find("Source directory"):
                         tokens = line.split()
                         if len(tokens) == 4:

libs/pyext/samples/TestBench.py

@@ -121,7 +121,7 @@ def traverse_container(node_container):
             This programs assumes that ecflow module is accessible
 
             example:
-                python libs/pyext/samples/TestBench.py --port=3141 --verbose=True ANode/parser/test/data/good_defs/trigger/late.def
+                python libs/pyext/samples/TestBench.py --port=3141 --verbose=True libs/node/parser/test/data/good_defs/trigger/late.def
             """    
 
     print("####################################################################")

libs/pyext/samples/TestJobGenPerf.py

@@ -18,7 +18,7 @@
 #   ECF_ variables, we need to remove them and inject our own.
 #
 #   This test was created aid the performance testing of job generation
-#   It is tied to ANode/parser/test/TestJobGenPerf.cpp
+#   It is tied to libs/node/parser/test/TestJobGenPerf.cpp
 # =============================================================================
 import ecflow
 import os       # for getenv

libs/test/TestSingle.cpp

@@ -131,8 +131,8 @@ BOOST_AUTO_TEST_CASE(test_stress) {
 //   DurationTimer timer;
 //
 //   // location to mega.def and left over log file
-//   std::string log_file = File::test_data("ANode/parser/test/data/single_defs/mega.def_log","parser");
-//   std::string path = File::test_data("ANode/parser/test/data/single_defs/mega.def","parser");
+//   std::string log_file = File::test_data("libs/node/parser/test/data/single_defs/mega.def_log","parser");
+//   std::string path = File::test_data("libs/node/parser/test/data/single_defs/mega.def","parser");
 //
 //   cout << "Test:: ..." << path << " log file: " << log_file << flush;
 //