Tue Jul 28 21:39:32 UTC 2009 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>

11 files changed, 99 insertions, 83 deletions

diff --git a/ChangeLog b/ChangeLog
index 110bc806e45..02132c4ae65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Tue Jul 28 21:39:32 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
+
+        * SA_POP/C2W/C2W_Demo.mpc:
+        * SA_POP/SANet/SANet_Standalone.mpc:
+        * SA_POP/SAPOP_w_ACE.mpc:
+        * SA_POP/Standalone/SAPOP_Demo.mpc:
+        * SA_POP/Standalone/XML_Utils/XML/XML.mpc:
+
+          Updates to SA-POP MWC build system.
+
+
+        * SA_POP/SA_POP_Types.h:
+        * SA_POP/TaskMapFileIn.cpp:
+        * SA_POP/SANet/SANetFileIn.cpp:
+        * SA_POP/SANet/SANet_Types.h:
+
+          Updates to SA-POP XML handling (now checks $(SAPOP_ROOT)/docs/schema/ for XSD files).
+
+
 Mon Jul 27 23:53:25 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
         * MPC/config/sapop.mpb:
diff --git a/SA_POP/C2W/C2W_Demo.mpc b/SA_POP/C2W/C2W_Demo.mpc
index 6148ace4e2f..389682f9982 100644
--- a/SA_POP/C2W/C2W_Demo.mpc
+++ b/SA_POP/C2W/C2W_Demo.mpc
@@ -1,19 +1,6 @@
 project(C2W_Demo) : xerces, aceexe, sapop_core_standalone {
   exename = C2W_Demo
 
-//  after += SA_POP
-
-//  includes += $(SAPOP_ROOT) \
-// //              $(SAPOP_ROOT)/Standalone/XML_Utils
-
-//  libpaths += $(SAPOP_ROOT)/lib
-
-//  libs += SA_POP
-
-// //  dynamicflags = CIAO_XML_UTILS_BUILD_DLL
-
-  macros = SA_POP_HAS_ACE
-
   Source_Files {
     C2W_Demo.cpp
     UserInput.cpp
diff --git a/SA_POP/ChangeLog b/SA_POP/ChangeLog
index 9bd1721cc4d..b6561326a5c 100644
--- a/SA_POP/ChangeLog
+++ b/SA_POP/ChangeLog
@@ -1,3 +1,22 @@
+Tue Jul 28 21:39:32 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
+
+        * C2W/C2W_Demo.mpc:
+        * SANet/SANet_Standalone.mpc:
+        * SAPOP_w_ACE.mpc:
+        * Standalone/SAPOP_Demo.mpc:
+        * Standalone/XML_Utils/XML/XML.mpc:
+
+          Updates to SA-POP MWC build system.
+
+
+        * SA_POP_Types.h:
+        * TaskMapFileIn.cpp:
+        * SANet/SANetFileIn.cpp:
+        * SANet/SANet_Types.h:
+
+          Updates to SA-POP XML handling (now checks $(SAPOP_ROOT)/docs/schema/ for XSD files).
+
+
 Mon Jul 27 23:53:25 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
         * C2W/C2W_Demo.mpc:
@@ -36,6 +55,13 @@ Mon Jul 27 23:53:25 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.ed
 
           SANet Standalone updated for latest XML utilities.
 
+Mon Jun 15 17:51:23 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Component/SA_POP_Component.mpc:
+        * Tester/Tester_Component.mpc:
+
+          Linking fixes.
+
 Fri Jun 12 20:58:24 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
         * SANet/SANetFileIn.cpp:
@@ -64,62 +90,50 @@ Fri Jun 12 17:37:05 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.ed
 
 Thu Jun 11 20:02:58 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
-        * common/RACE_common.mpc:
-        * MPC/config/race_common.mpb:
-
-          RACE libraries output to $(ACE_ROOT)/lib
-
-
-        * RACE.mwc:
-        * RACE_SAPOP.mwc:
-
-          Updated with revised filenames
-
-
-        * SA_POP/SAPOP_C2W.mwc:
-        * SA_POP/SAPOP_Standalone.mwc:
-        * SA_POP/SAPOP_for_RACE.mpc:
-        * SA_POP/SAPOP_w_ACE.mpc:
-        * SA_POP/SA_POP_XML_Typedefs.cpp:
+        * SAPOP_C2W.mwc:
+        * SAPOP_Standalone.mwc:
+        * SAPOP_for_RACE.mpc:
+        * SAPOP_w_ACE.mpc:
+        * SA_POP_XML_Typedefs.cpp:
 
           Updated for latest version of CIAO XML Utilities
 
 
-        * SA_POP/Standalone/XML_Utils/XML:
+        * Standalone/XML_Utils/XML:
 
-        * SA_POP/Standalone/XML_Utils/XML/CIAO_XML_Utils_Export.h:
-        * SA_POP/Standalone/XML_Utils/XML/XML.mpc:
-        * SA_POP/Standalone/XML_Utils/XML/XML_Error_Handler.h:
-        * SA_POP/Standalone/XML_Utils/XML/XML_Error_Handler.cpp:
-        * SA_POP/Standalone/XML_Utils/XML/XML_Helper.h:
-        * SA_POP/Standalone/XML_Utils/XML/XML_Helper.tpp:
-        * SA_POP/Standalone/XML_Utils/XML/XML_Schema_Resolver.h:
-        * SA_POP/Standalone/XML_Utils/XML/XML_Schema_Resolver.tpp:
-        * SA_POP/Standalone/XML_Utils/XML/XML_Schema_Resolver.cpp:
-        * SA_POP/Standalone/XML_Utils/XML/XercesString.h:
-        * SA_POP/Standalone/XML_Utils/XML/XercesString.cpp:
+        * Standalone/XML_Utils/XML/CIAO_XML_Utils_Export.h:
+        * Standalone/XML_Utils/XML/XML.mpc:
+        * Standalone/XML_Utils/XML/XML_Error_Handler.h:
+        * Standalone/XML_Utils/XML/XML_Error_Handler.cpp:
+        * Standalone/XML_Utils/XML/XML_Helper.h:
+        * Standalone/XML_Utils/XML/XML_Helper.tpp:
+        * Standalone/XML_Utils/XML/XML_Schema_Resolver.h:
+        * Standalone/XML_Utils/XML/XML_Schema_Resolver.tpp:
+        * Standalone/XML_Utils/XML/XML_Schema_Resolver.cpp:
+        * Standalone/XML_Utils/XML/XercesString.h:
+        * Standalone/XML_Utils/XML/XercesString.cpp:
 
-        * SA_POP/Standalone/XML_Utils/XMLSchema/TypeInfo.tpp:
-        * SA_POP/Standalone/XML_Utils/XMLSchema/Types.hpp:
+        * Standalone/XML_Utils/XMLSchema/TypeInfo.tpp:
+        * Standalone/XML_Utils/XMLSchema/Types.hpp:
 
-        * SA_POP/Standalone/XML_Utils/XSCRT/Elements.hpp:
-        * SA_POP/Standalone/XML_Utils/XSCRT/Traversal.hpp:
-        * SA_POP/Standalone/XML_Utils/XSCRT/Traversal.tpp:
-        * SA_POP/Standalone/XML_Utils/XSCRT/XML.hpp:
-        * SA_POP/Standalone/XML_Utils/XSCRT/XMLSchema.hpp:
+        * Standalone/XML_Utils/XSCRT/Elements.hpp:
+        * Standalone/XML_Utils/XSCRT/Traversal.hpp:
+        * Standalone/XML_Utils/XSCRT/Traversal.tpp:
+        * Standalone/XML_Utils/XSCRT/XML.hpp:
+        * Standalone/XML_Utils/XSCRT/XMLSchema.hpp:
 
           Updated to latest version of CIAO XML Utilities
 
 
-        * SA_POP/Tester/Tester_Component.mpc:
+        * Tester/Tester_Component.mpc:
 
           Updated for changes to CIAO and DAnCE
 
 
-        * SA_POP/SA_POP_for_RACE.mpc:
-        * SA_POP/Standalone/XML_Utils/Common.h:
-        * SA_POP/Standalone/XML_Utils/SAPOP_XSC.mpc:
-        * SA_POP/Standalone/XML_Utils/XSC_XML_Handlers_Export.h:
+        * SA_POP_for_RACE.mpc:
+        * Standalone/XML_Utils/Common.h:
+        * Standalone/XML_Utils/SAPOP_XSC.mpc:
+        * Standalone/XML_Utils/XSC_XML_Handlers_Export.h:
 
           Removed these files for CIAO XML Utilities update.
 
diff --git a/SA_POP/SANet/SANetFileIn.cpp b/SA_POP/SANet/SANetFileIn.cpp
index 56bd19f3454..6419004b6ea 100644
--- a/SA_POP/SANet/SANetFileIn.cpp
+++ b/SA_POP/SANet/SANetFileIn.cpp
@@ -46,6 +46,9 @@ Network *SANetFileIn::build_net (std::string filename)
   if (!XML_Helper::XML_HELPER.is_initialized ())
     return 0;
 
+  // Set path to XML schemas (XSD files).
+  XML_Helper::_path_resolver.add_path (SA_POP::ROOT_PATH_STR.c_str (), SA_POP::XSD_REL_PATH_STR.c_str ());
+
   // Parse file with Xerces.
   XERCES_CPP_NAMESPACE::DOMDocument *dom =
 //*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****
@@ -158,6 +161,9 @@ void SANetFileIn::build_net (std::string filename, SA_POP::Builder *builder)
   if (!XML_Helper::XML_HELPER.is_initialized ())
     return;
 
+  // Set path to XML schemas (XSD files).
+  XML_Helper::_path_resolver.add_path (SA_POP::ROOT_PATH_STR.c_str (), SA_POP::XSD_REL_PATH_STR.c_str ());
+
   // Parse file with Xerces.
   XERCES_CPP_NAMESPACE::DOMDocument *dom =
 //*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****
diff --git a/SA_POP/SANet/SANet_Standalone.mpc b/SA_POP/SANet/SANet_Standalone.mpc
index f79dc492c42..d49da025fcc 100644
--- a/SA_POP/SANet/SANet_Standalone.mpc
+++ b/SA_POP/SANet/SANet_Standalone.mpc
@@ -1,15 +1,11 @@
 project(SANet_Demo) : xerces, aceexe, sapop_xml {
   exename = SANet_Demo
 
-//  includes += $(SAPOP_ROOT)/Standalone/XML_Utils
   includes += $(SAPOP_ROOT)
 
-//  dynamicflags = CIAO_XML_UTILS_BUILD_DLL
-
   macros = SANET_STANDALONE
 
 
-
   Header_Files {
     SANet_Types.h
     SANet_Exceptions.h
@@ -33,10 +29,6 @@ project(SANet_Demo) : xerces, aceexe, sapop_xml {
     SANet_XML_Typedefs.cpp
     SANetFileIn.cpp
     XML_SANet.cpp
-//    $(SAPOP_ROOT)/Standalone/XML_Utils/Utils/XML_Helper.cpp
-//    $(SAPOP_ROOT)/Standalone/XML_Utils/Utils/XML_Error_Handler.cpp
-//    $(SAPOP_ROOT)/Standalone/XML_Utils/Utils/XML_Schema_Resolver.cpp
-//    $(SAPOP_ROOT)/Standalone/XML_Utils/Utils/XercesString.cpp
   }
 
   Documentation_Files {
diff --git a/SA_POP/SANet/SANet_Types.h b/SA_POP/SANet/SANet_Types.h
index 0b100a2480c..fa52d12647d 100644
--- a/SA_POP/SANet/SANet_Types.h
+++ b/SA_POP/SANet/SANet_Types.h
@@ -188,6 +188,16 @@ namespace SANet {
 
 
 #if defined (SANET_STANDALONE)
+namespace SA_POP {
+
+  /// Environment variable for root path.
+  const std::string ROOT_PATH_STR = "SAPOP_ROOT";
+
+  /// Relative path (from root path) to SA-POP XML schemas.
+  const std::string XSD_REL_PATH_STR = "/docs/schema/";
+
+};  /* SA_POP namespace */
+
 namespace SANet {
 
   /// Type of a node id (tasks and conditions).
diff --git a/SA_POP/SAPOP_w_ACE.mpc b/SA_POP/SAPOP_w_ACE.mpc
index 53845fca66a..7b43ed85896 100644
--- a/SA_POP/SAPOP_w_ACE.mpc
+++ b/SA_POP/SAPOP_w_ACE.mpc
@@ -2,15 +2,9 @@ project(SA_POP) : xerces, acelib, sapop_xml, sapop_out {
 
    sharedname   = SA_POP
 
-//   libout = $(SAPOP_ROOT)/lib
-
 //   libpaths += $(SAPOP_ROOT)/lib
 
-//   after += SAPOP_XML_Utils
-
-
    includes += $(SAPOP_ROOT)
-//               $(SAPOP_ROOT)/Standalone/XML_Utils
 
    macros = SA_POP_HAS_ACE
 
@@ -22,8 +16,6 @@ project(SA_POP) : xerces, acelib, sapop_xml, sapop_out {
                     LOGSCREENOUT_BUILD_DLL \
 		    LOGGRAPHOUT_BUILD_DLL
 
-//   libs += SAPOP_XML_Utils
-
 
    Header_Files {
       SA_POP_Types.h
diff --git a/SA_POP/SA_POP_Types.h b/SA_POP/SA_POP_Types.h
index ee45b9ee24b..18bda7b3669 100644
--- a/SA_POP/SA_POP_Types.h
+++ b/SA_POP/SA_POP_Types.h
@@ -48,6 +48,12 @@ if (x > 0) \
 
 namespace SA_POP {
 
+  /// Environment variable for root path.
+  const std::string ROOT_PATH_STR = "SAPOP_ROOT";
+
+  /// Relative path (from root path) to SA-POP XML schemas.
+  const std::string XSD_REL_PATH_STR = "/docs/schema/";
+
   /// Type of a node id (tasks and conditions).
   /// (must be > 0 and unique across all tasks *and* conditions).
   typedef int NodeID;
diff --git a/SA_POP/Standalone/SAPOP_Demo.mpc b/SA_POP/Standalone/SAPOP_Demo.mpc
index 233f075c25d..ec49404f256 100644
--- a/SA_POP/Standalone/SAPOP_Demo.mpc
+++ b/SA_POP/Standalone/SAPOP_Demo.mpc
@@ -1,17 +1,6 @@
 project(SA_POP_Demo) : xerces, aceexe, sapop_core_standalone {
   exename = SA_POP_Demo
 
-//  after += SA_POP
-
-//  includes += $(SAPOP_ROOT) \
-// //              $(SAPOP_ROOT)/Standalone/XML_Utils
-
-//  libpaths += $(SAPOP_ROOT)/lib
-
-//  libs += SA_POP
-
-// //  macros = SA_POP_HAS_ACE
-
   Source_Files {
     SA_POP_Demo.cpp
     UserInput.cpp
diff --git a/SA_POP/Standalone/XML_Utils/XML/XML.mpc b/SA_POP/Standalone/XML_Utils/XML/XML.mpc
index 1daeaccd7f6..ffa810dbfa4 100644
--- a/SA_POP/Standalone/XML_Utils/XML/XML.mpc
+++ b/SA_POP/Standalone/XML_Utils/XML/XML.mpc
@@ -3,8 +3,6 @@
 project (SAPOP_XML_Utils) : acelib, xerces, sapop_out {
   sharedname   += SAPOP_XML_Utils
 
-//  libout = $(SAPOP_ROOT)/lib
-
   includes += ..
 
   dynamicflags  = CIAO_XML_UTILS_BUILD_DLL
diff --git a/SA_POP/TaskMapFileIn.cpp b/SA_POP/TaskMapFileIn.cpp
index a91a44de6e1..964d84aeb50 100644
--- a/SA_POP/TaskMapFileIn.cpp
+++ b/SA_POP/TaskMapFileIn.cpp
@@ -40,6 +40,9 @@ void TaskMapFileIn::build_task_map (std::string filename, Builder *builder)
   if (!XML_Helper::XML_HELPER.is_initialized ())
     throw "SA_POP::TaskMapFileIn::build_task_map (): Could not initialize XML_Helper";
 
+  // Set path to XML schemas (XSD files).
+  XML_Helper::_path_resolver.add_path (SA_POP::ROOT_PATH_STR.c_str (), SA_POP::XSD_REL_PATH_STR.c_str ());
+
   // Parse file with Xerces.
   XERCES_CPP_NAMESPACE::DOMDocument *dom =
 //*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****