Merge branch 'version_1.3' of github.com:mtconnect/cppagent into version_1.3

Author: Will Sobel

test/config_test.cpp

@@ -331,28 +331,28 @@ void ConfigTest::testSchemaDirectory()
                         "Path = ../schemas\n"
                         "}\n"
                         "}\n");
-  
+
   mConfig->loadConfig(schemas);
   string path = XmlPrinter::getStreamsUrn("m");
   CPPUNIT_ASSERT_EQUAL((string) "urn:mtconnect.org:MTConnectStreams:1.3", path);
   string location = XmlPrinter::getStreamsLocation("m");
-  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectStreams_1.2.xsd", location);
+  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectStreams_1.3.xsd", location);
 
   path = XmlPrinter::getDevicesUrn("m");
   CPPUNIT_ASSERT_EQUAL((string) "urn:mtconnect.org:MTConnectDevices:1.3", path);
   location = XmlPrinter::getDevicesLocation("m");
-  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectDevices_1.2.xsd", location);
+  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectDevices_1.3.xsd", location);
 
   path = XmlPrinter::getAssetsUrn("m");
   CPPUNIT_ASSERT_EQUAL((string) "urn:mtconnect.org:MTConnectAssets:1.3", path);
   location = XmlPrinter::getAssetsLocation("m");
-  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectAssets_1.2.xsd", location);
+  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectAssets_1.3.xsd", location);
 
   path = XmlPrinter::getErrorUrn("m");
   CPPUNIT_ASSERT_EQUAL((string) "urn:mtconnect.org:MTConnectError:1.3", path);
   location = XmlPrinter::getErrorLocation("m");
-  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectError_1.2.xsd", location);
-  
+  CPPUNIT_ASSERT_EQUAL((string) "/schemas/MTConnectError_1.3.xsd", location);
+
   XmlPrinter::clearDevicesNamespaces();
   XmlPrinter::clearErrorNamespaces();
   XmlPrinter::clearStreamsNamespaces();
@@ -443,4 +443,4 @@ void ConfigTest::testMaxSize()
   fl = mConfig->getLogger();
   CPPUNIT_ASSERT_EQUAL(15 * 1024 * 1024 * 1024, fl->getMaxSize());
 
-}
+}