Mon Jul 27 23:53:25 UTC 2009 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>

22 files changed, 239 insertions, 76 deletions

diff --git a/ChangeLog b/ChangeLog
index 69b3d36347e..110bc806e45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+Mon Jul 27 23:53:25 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
+
+        * MPC/config/sapop.mpb:
+          Removed this file.
+
+        * RACE_SAPOP.mwc:
+
+        * SA_POP/C2W/C2W_Demo.mpc:
+
+        * SA_POP/Component/SA_POP_Component.mpc:
+
+        * SA_POP/Instructions for building middleware RACE SA-POP and CoSMIC.txt:
+        * SA_POP/MPC:
+
+        * SA_POP/MPC/config:
+
+        * SA_POP/MPC/config/sapop_core.mpb:
+        * SA_POP/MPC/config/sapop_core_standalone.mpb:
+        * SA_POP/MPC/config/sapop_out.mpb:
+        * SA_POP/MPC/config/sapop_xml.mpb:
+
+        * SA_POP/SAPOP_C2W.mwc:
+        * SA_POP/SAPOP_Standalone.mwc:
+        * 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/SANet/SANetFileIn.h:
+        * SA_POP/SANet/SANetFileIn.cpp:
+        * SA_POP/SANet/SANet_Standalone.mpc:
+        * SA_POP/SANet/SANet_Types.h:
+        * SA_POP/SANet/SANet_XML_Typedefs.h:
+        * SA_POP/SANet/SANet_XML_Typedefs.cpp:
+
+        * SA_POP/SANet_Standalone.mwc:
+
+          SANet Standalone updated for latest XML utilities.
+
 Thu Jul  2 20:14:08 UTC 2009  William R. Otte <wotte@dre.vanderbilt.edu>
 
         * Effectors/Base/Effector_Base.mpc:
@@ -5,7 +50,7 @@ Thu Jul  2 20:14:08 UTC 2009  William R. Otte <wotte@dre.vanderbilt.edu>
         * Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp:
         * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc:
 
-	Compile fixes. 
+        Compile fixes.
 
 Mon Jun 15 17:51:23 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
diff --git a/RACE_SAPOP.mwc b/RACE_SAPOP.mwc
index f8971516674..af951b3fe56 100644
--- a/RACE_SAPOP.mwc
+++ b/RACE_SAPOP.mwc
@@ -1,5 +1,6 @@
 workspace {
   cmdline += -include $RACE_ROOT/MPC/config
+  cmdline += -include $SAPOP_ROOT/MPC/config
   common
   utils
   Controller/Base
diff --git a/SA_POP/C2W/C2W_Demo.mpc b/SA_POP/C2W/C2W_Demo.mpc
index 319c9388319..6148ace4e2f 100644
--- a/SA_POP/C2W/C2W_Demo.mpc
+++ b/SA_POP/C2W/C2W_Demo.mpc
@@ -1,16 +1,16 @@
-project(C2W_Demo) : xerces, aceexe {
+project(C2W_Demo) : xerces, aceexe, sapop_core_standalone {
   exename = C2W_Demo
 
-  after += SA_POP
+//  after += SA_POP
 
-  includes += $(SAPOP_ROOT) \
-              $(SAPOP_ROOT)/Standalone/XML_Utils
+//  includes += $(SAPOP_ROOT) \
+// //              $(SAPOP_ROOT)/Standalone/XML_Utils
 
-  libpaths += $(SAPOP_ROOT)/lib
+//  libpaths += $(SAPOP_ROOT)/lib
 
-  libs += SA_POP
+//  libs += SA_POP
 
-  dynamicflags = CIAO_XML_UTILS_BUILD_DLL
+// //  dynamicflags = CIAO_XML_UTILS_BUILD_DLL
 
   macros = SA_POP_HAS_ACE
 
diff --git a/SA_POP/ChangeLog b/SA_POP/ChangeLog
index 18447a9eaf4..9bd1721cc4d 100644
--- a/SA_POP/ChangeLog
+++ b/SA_POP/ChangeLog
@@ -1,3 +1,41 @@
+Mon Jul 27 23:53:25 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
+
+        * C2W/C2W_Demo.mpc:
+
+        * Component/SA_POP_Component.mpc:
+
+        * Instructions for building middleware RACE SA-POP and CoSMIC.txt:
+        * MPC:
+
+        * MPC/config:
+
+        * MPC/config/sapop_core.mpb:
+        * MPC/config/sapop_core_standalone.mpb:
+        * MPC/config/sapop_out.mpb:
+        * MPC/config/sapop_xml.mpb:
+
+        * SAPOP_C2W.mwc:
+        * SAPOP_Standalone.mwc:
+        * SAPOP_w_ACE.mpc:
+
+        * Standalone/SAPOP_Demo.mpc:
+
+        * Standalone/XML_Utils/XML/XML.mpc:
+
+          Updates to SA-POP MWC build system.
+
+
+        * SANet/SANetFileIn.h:
+        * SANet/SANetFileIn.cpp:
+        * SANet/SANet_Standalone.mpc:
+        * SANet/SANet_Types.h:
+        * SANet/SANet_XML_Typedefs.h:
+        * SANet/SANet_XML_Typedefs.cpp:
+
+        * SANet_Standalone.mwc:
+
+          SANet Standalone updated for latest XML utilities.
+
 Fri Jun 12 20:58:24 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
         * SANet/SANetFileIn.cpp:
diff --git a/SA_POP/Component/SA_POP_Component.mpc b/SA_POP/Component/SA_POP_Component.mpc
index 3c1e26fedad..336b5666971 100644
--- a/SA_POP/Component/SA_POP_Component.mpc
+++ b/SA_POP/Component/SA_POP_Component.mpc
@@ -77,7 +77,7 @@ project(SA_POP_Component_stub) : ccm_stub , race_opstring, race_data_base_stub
   }
 }
 
-project(SA_POP_Component_exec) : ciao_executor , race_opstring, race_data_base_stub, sapop  {
+project(SA_POP_Component_exec) : ciao_executor , race_opstring, race_data_base_stub, sapop_core  {
   after   += SA_POP_Component_lem_stub SA_POP_Component_stub SA_POP_Component_svnt
   sharedname = SA_POP_Component_exec
   libs += SA_POP_Component_stub SA_POP_Component_lem_stub SA_POP_Component_svnt
diff --git a/SA_POP/Instructions for building middleware RACE SA-POP and CoSMIC.txt b/SA_POP/Instructions for building middleware RACE SA-POP and CoSMIC.txt
index 50e51c4b596..6969fc1b610 100644
--- a/SA_POP/Instructions for building middleware RACE SA-POP and CoSMIC.txt
+++ b/SA_POP/Instructions for building middleware RACE SA-POP and CoSMIC.txt
@@ -1,7 +1,7 @@
 $Id$
 
 Instructions for building middleware (including ACE, TAO, CIAO, DAnCE), MACRO (including ANA, RACE, SA-POP), & CoSMIC (including PICML)
-  03/19/2009 Revision (John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>)
+  07/27/2009 Revision (John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>)
 
 
 
@@ -34,23 +34,7 @@ Boost (06/08/2007):
 
 
 
-CIDLC (09/25/2008):
--CIDLC (IF using pre-built binary)
-  -Get appropriate version of cidlc.exe from http://www.dre.vanderbilt.edu/cidlc/binary/ (or http://www.dre.vanderbilt.edu/~isisbuilds/CIDLC/ for latest)
-  -Place cidlc.exe in %CIAO_ROOT%\bin\
--CIDLC (IF building) (Spring 2006):
-  -Install, build if necessary, and set environment variables for:
-    -Boost [install pre-built or build, & set env. vars.]
-  -Set MPC to use Boost and CIDL
-    -Open %ACE_ROOT%\bin\MakeProjectCreator\config\default.features, then set "cidl" and "boost" to 1, and save.
-  -Generate MSVC++ projects and solution, if necessary.
-    cd %CIAO_ROOT%\CIDLC
-    perl %ACE_ROOT%\bin\mwc.pl -type vc8 CIDLC.mwc
-  -Open CIDLC.sln and build solution (in MSVC++)
-    devenv /build "Debug|Win32" CIDLC.sln
-
-
-ACE/TAO/CIAO/DAnCE (09/25/2008):
+ACE/TAO/CIAO/DAnCE (07/27/2009):
 (http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html)
 (http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/TAO-INSTALL.html)
 (http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/CIAO/CIAO-INSTALL.html)
@@ -58,9 +42,8 @@ ACE/TAO/CIAO/DAnCE (09/25/2008):
   -Microsoft Visual Studio 2005 Professional [install]
   -ActiveState ActivePerl (e.g., 5.8.8.820-MSWin32-x86-274739 or later) [install]
   -MPC [IF using packaged release of ACE+TAO+CIAO it comes with MPC and do *NOT* set MPC_ROOT; otherwise checkout development version or download release version, and set env. vars.]
-  -Subversion (e.g., 1.4.3-r23084 or later) [install]
-  -CIDLC [install pre-built or build] (AFTER extracting release archive or checkout of ACE/TAO/CIAO)
-  -Xerces-C (e.g., 2.7.0-win32-vc8 or 2.8.0-win32-vc8) [install pre-built & set env. vars.]
+  -Subversion (e.g., 1.6.1 or later) [install]
+  -Xerces-C (e.g., 2.8.0-win32-vc8) [install pre-built & set env. vars.]
 -FIRST TIME (Release version ONLY):
   -Download source for a release/micro-release from http://download.dre.vanderbilt.edu/
   -Extract (e.g. to C:\Middleware\X_Y_Z for version X.Y.Z so %ACE_ROOT% would be C:\Middleware\X_Y_Z\ACE_wrappers)
@@ -80,6 +63,8 @@ ACE/TAO/CIAO/DAnCE (09/25/2008):
   -Set Make Project Creator default configuration in %ACE_ROOT%\bin\MakeProjectCreator\config\
     cd %ACE_ROOT%\bin\MakeProjectCreator\config\
     copy global.features default.features
+    -Open %ACE_ROOT%\bin\MakeProjectCreator\config\default.features, then set "xerces2" to 1, and save.
+      notepad %ACE_ROOT%\bin\MakeProjectCreator\config\default.features
 -Set ACE, TAO, & CIAO environment variables
 -(SVN Dev version ONLY) Update ACE/CIAO/TAO from svn.dre.vanderbilt.edu
   cd C:\Middleware
@@ -117,7 +102,7 @@ RACE/SA-POP (09/25/2008):
 
 
 
-ACE [only ACE, without TAO & CIAO] (03/18/2009):
+ACE [only ACE, without TAO & CIAO] (06/11/2009):
 (http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html)
 -Install and set environment variables for:
   -Microsoft Visual Studio 2005 Professional [install]
@@ -138,6 +123,8 @@ ACE [only ACE, without TAO & CIAO] (03/18/2009):
   -Set Make Project Creator default configuration in %ACE_ROOT%\bin\MakeProjectCreator\config\
     cd %ACE_ROOT%\bin\MakeProjectCreator\config\
     copy global.features default.features
+    -Open %ACE_ROOT%\bin\MakeProjectCreator\config\default.features, then set "xerces2" to 1, and save.
+      notepad %ACE_ROOT%\bin\MakeProjectCreator\config\default.features
 -Build ACE
   -Generate (or regenerate) MSVC++ projects and solution.
     cd %ACE_ROOT%
@@ -184,7 +171,7 @@ DAnCE RepositoryManager (09/25/2008):
   -zlib (e.g., 1.2.3) [install pre-built & set env. vars.]
   -ACE/TAO/CIAO/DAnCE [set env. vars.; will all be built along with RepoMan if using CIAO_TAO_DAnCE.mwc]
 -FIRST TIME
-  -Open %ACE_ROOT%\bin\MakeProjectCreator\config\default.features, then set "zlib" to 1, and save.
+  -Open %ACE_ROOT%\bin\MakeProjectCreator\config\default.features, then set "zlib" and "xerces2" both to 1, and save.
     notepad %ACE_ROOT%\bin\MakeProjectCreator\config\default.features
 -For Repoman with ACE/TAO/CIAO/DAnCE, generate (or regenerate) MSVC++ projects and solution, if necessary.
   cd %CIAO_ROOT%
@@ -357,19 +344,26 @@ and then run appropriate environment batch file (example for ACE/TAO/CIAO 5.6.6)
 
 
 
-Environment variables that must be set (example for ACE/TAO/CIAO 5.6.6):
+Environment variables that must be set (example for ACE/TAO/CIAO 5.7.2 and MACRO):
 
 ACE:
-ACE_ROOT=C:/Middleware/5_6_6/ACE_wrappers
+ACE_ROOT=C:/Middleware/5_7_2/ACE_wrappers
 Path=%ACE_ROOT%/bin;%ACE_ROOT%/lib;%PATH%
 
 
 TAO:
-TAO_ROOT=C:/Middleware/5_6_6/ACE_wrappers/TAO
+TAO_ROOT=C:/Middleware/5_7_2/ACE_wrappers/TAO
+Path=%TAO_ROOT%/bin;%PATH%
 
 
 CIAO:
-CIAO_ROOT=C:/Middleware/5_6_6/ACE_wrappers/TAO/CIAO
+CIAO_ROOT=C:/Middleware/5_7_2/ACE_wrappers/TAO/CIAO
+Path=%CIAO_ROOT%/bin;%PATH%
+
+
+DAnCE:
+DANCE_ROOT=C:/Middleware/5_7_2/ACE_wrappers/TAO/CIAO/DAnCE
+Path=%DANCE_ROOT%/bin;%DANCE_ROOT%/lib;%PATH%
 
 
 Xerces:
@@ -401,6 +395,7 @@ Path=%CUTS_ROOT%/bin;%PATH%
 
 RACE:
 RACE_ROOT=C:/Middleware/MACRO/RACE
+Path=%RACE_ROOT%/lib;%PATH%
 
 
 SA-POP:
diff --git a/MPC/config/sapop.mpb b/SA_POP/MPC/config/sapop_core.mpb
index 9adf50194a1..83eb81287d5 100644
--- a/MPC/config/sapop.mpb
+++ b/SA_POP/MPC/config/sapop_core.mpb
@@ -1,4 +1,5 @@
 project {
+  includes += $(SAPOP_ROOT)
   after += SA_POP
   libs += SA_POP
-}
\ No newline at end of file
+}
diff --git a/SA_POP/MPC/config/sapop_core_standalone.mpb b/SA_POP/MPC/config/sapop_core_standalone.mpb
new file mode 100644
index 00000000000..9da85c92657
--- /dev/null
+++ b/SA_POP/MPC/config/sapop_core_standalone.mpb
@@ -0,0 +1,5 @@
+project : sapop_core {
+
+  libpaths += $(SAPOP_ROOT)/lib
+
+}
diff --git a/SA_POP/MPC/config/sapop_out.mpb b/SA_POP/MPC/config/sapop_out.mpb
new file mode 100644
index 00000000000..e93e6defd26
--- /dev/null
+++ b/SA_POP/MPC/config/sapop_out.mpb
@@ -0,0 +1,3 @@
+project {
+  libout     =  $(SAPOP_ROOT)/lib	
+}
\ No newline at end of file
diff --git a/SA_POP/MPC/config/sapop_xml.mpb b/SA_POP/MPC/config/sapop_xml.mpb
new file mode 100644
index 00000000000..d59dbf0d490
--- /dev/null
+++ b/SA_POP/MPC/config/sapop_xml.mpb
@@ -0,0 +1,10 @@
+project {
+
+  after += SAPOP_XML_Utils
+
+  includes += $(SAPOP_ROOT)/Standalone/XML_Utils
+
+  libpaths += $(SAPOP_ROOT)/lib
+
+  libs += SAPOP_XML_Utils
+}
diff --git a/SA_POP/SANet/SANetFileIn.cpp b/SA_POP/SANet/SANetFileIn.cpp
index 38edf710018..56bd19f3454 100644
--- a/SA_POP/SANet/SANetFileIn.cpp
+++ b/SA_POP/SANet/SANetFileIn.cpp
@@ -17,9 +17,11 @@
 
 #if !defined (SANET_STANDALONE)
 #include "Builder.h"
+#include "SA_POP_XML_Typedefs.h"
+#else
+#include "SANet_XML_Typedefs.h"
 #endif
 
-#include "SA_POP_XML_Typedefs.h"
 #include "XML_SANet.hpp"
 
 using namespace SANet;
diff --git a/SA_POP/SANet/SANetFileIn.h b/SA_POP/SANet/SANetFileIn.h
index 1aeff482abb..09fafe64dee 100644
--- a/SA_POP/SANet/SANetFileIn.h
+++ b/SA_POP/SANet/SANetFileIn.h
@@ -19,8 +19,8 @@
 #include "SANet.h"
 
 #if !defined (SANET_STANDALONE)
-#include "SA_POP/Builder.h"
-#include "SA_POP/SANet/SANetFileIn_Export.h"
+#include "Builder.h"
+#include "SANet/SANetFileIn_Export.h"
 #endif
 
 namespace SANet {
diff --git a/SA_POP/SANet/SANet_Standalone.mpc b/SA_POP/SANet/SANet_Standalone.mpc
index 1c7879e74cb..f79dc492c42 100644
--- a/SA_POP/SANet/SANet_Standalone.mpc
+++ b/SA_POP/SANet/SANet_Standalone.mpc
@@ -1,13 +1,27 @@
-project(SANet_Demo) : xerces, aceexe {
+project(SANet_Demo) : xerces, aceexe, sapop_xml {
   exename = SANet_Demo
 
-  includes += $(SAPOP_ROOT)/Standalone/XML_Utils
+//  includes += $(SAPOP_ROOT)/Standalone/XML_Utils
+  includes += $(SAPOP_ROOT)
 
-  dynamicflags = CIAO_XML_UTILS_BUILD_DLL
+//  dynamicflags = CIAO_XML_UTILS_BUILD_DLL
 
   macros = SANET_STANDALONE
 
 
+
+  Header_Files {
+    SANet_Types.h
+    SANet_Exceptions.h
+
+    SANode.h
+    SANet.h
+
+    SANet_XML_Typedefs.h
+    SANetFileIn.h
+  }
+
+
   Source_Files {
     SANet_UI.cpp
 
@@ -16,22 +30,13 @@ project(SANet_Demo) : xerces, aceexe {
     SANode.cpp
     SANet.cpp
 
+    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
-  }
-
-  Header_Files {
-    SANet_Types.h
-    SANet_Exceptions.h
-
-    SANode.h
-    SANet.h
-
-    SANetFileIn.h
+//    $(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 443ba67efe1..0b100a2480c 100644
--- a/SA_POP/SANet/SANet_Types.h
+++ b/SA_POP/SANet/SANet_Types.h
@@ -24,7 +24,7 @@
 
 #if !defined (SANET_STANDALONE)
 
-#include "SA_POP/SA_POP_Types.h"
+#include "SA_POP_Types.h"
 
 namespace SANet {
   /// Type of a node id (tasks and conditions).
diff --git a/SA_POP/SANet/SANet_XML_Typedefs.cpp b/SA_POP/SANet/SANet_XML_Typedefs.cpp
new file mode 100644
index 00000000000..5386a2c052c
--- /dev/null
+++ b/SA_POP/SANet/SANet_XML_Typedefs.cpp
@@ -0,0 +1,14 @@
+// $Id$
+
+#include "SANet_XML_Typedefs.h"
+
+namespace SA_POP
+{
+  namespace XML
+  {
+    XML_Helper::PATH_RESOLVER XML_Helper::_path_resolver;
+    XML_Helper::XML_RESOLVER XML_Helper::_xml_resolver (XML_Helper::_path_resolver);
+    XML_Helper::ERROR_HANDLER XML_Helper::_xml_error_handler;
+    XML_Helper::HELPER XML_Helper::XML_HELPER (XML_Helper::_xml_resolver, XML_Helper::_xml_error_handler);
+  }
+}
diff --git a/SA_POP/SANet/SANet_XML_Typedefs.h b/SA_POP/SANet/SANet_XML_Typedefs.h
new file mode 100644
index 00000000000..d178f663f7c
--- /dev/null
+++ b/SA_POP/SANet/SANet_XML_Typedefs.h
@@ -0,0 +1,39 @@
+/**
+ * @file XML_Typedefs.h
+ * @author William R. Otte <wotte@dre.vanderbilt.edu>
+ * $Id$
+ * Typedefs from the XML Utilities.
+ */
+#ifndef XML_TYPEDEFS_H
+#define XML_TYPEDEFS_H
+
+#include "XML/XML_Helper.h"
+#include "XML/XML_Schema_Resolver.h"
+#include "XML/XML_Error_Handler.h"
+
+//#include "SA_Builder_Export.h"
+
+namespace SA_POP
+{
+  namespace XML
+  {
+    class XML_Helper
+    {
+    public:
+      typedef ::CIAO::XML::Environment_Resolver PATH_RESOLVER;
+      typedef ::CIAO::XML::XML_Schema_Resolver< ::CIAO::XML::Environment_Resolver > XML_RESOLVER;
+      typedef ::CIAO::XML::XML_Error_Handler ERROR_HANDLER;
+      typedef ::CIAO::XML::XML_Helper< XML_RESOLVER, ERROR_HANDLER > HELPER;
+      
+      static PATH_RESOLVER _path_resolver;
+      static XML_RESOLVER _xml_resolver;
+      static ERROR_HANDLER _xml_error_handler;
+      
+    public:
+      static HELPER XML_HELPER;
+    };
+  }
+}
+
+
+#endif /* XML_TYPEDEFS_H */
diff --git a/SA_POP/SANet_Standalone.mwc b/SA_POP/SANet_Standalone.mwc
new file mode 100644
index 00000000000..ceff2cd8f89
--- /dev/null
+++ b/SA_POP/SANet_Standalone.mwc
@@ -0,0 +1,5 @@
+workspace {
+  cmdline += -include $SAPOP_ROOT/MPC/config
+  Standalone/XML_Utils/XML/XML.mpc
+  SANet/SANet_Standalone.mpc
+}
diff --git a/SA_POP/SAPOP_C2W.mwc b/SA_POP/SAPOP_C2W.mwc
index 4363d239248..6112b0caa5b 100644
--- a/SA_POP/SAPOP_C2W.mwc
+++ b/SA_POP/SAPOP_C2W.mwc
@@ -1,4 +1,5 @@
 workspace {
+  cmdline += -include $SAPOP_ROOT/MPC/config
   Standalone/XML_Utils/XML/XML.mpc
   SAPOP_w_ACE.mpc
   C2W/C2W_Demo.mpc
diff --git a/SA_POP/SAPOP_Standalone.mwc b/SA_POP/SAPOP_Standalone.mwc
index c963b6531e8..d90aba6d511 100644
--- a/SA_POP/SAPOP_Standalone.mwc
+++ b/SA_POP/SAPOP_Standalone.mwc
@@ -1,4 +1,5 @@
 workspace {
+  cmdline += -include $SAPOP_ROOT/MPC/config
   Standalone/XML_Utils/XML/XML.mpc
   SAPOP_w_ACE.mpc
   Standalone/SAPOP_Demo.mpc
diff --git a/SA_POP/SAPOP_w_ACE.mpc b/SA_POP/SAPOP_w_ACE.mpc
index 2e9463346b2..53845fca66a 100644
--- a/SA_POP/SAPOP_w_ACE.mpc
+++ b/SA_POP/SAPOP_w_ACE.mpc
@@ -1,16 +1,16 @@
-project(SA_POP) : xerces, acelib {
+project(SA_POP) : xerces, acelib, sapop_xml, sapop_out {
 
    sharedname   = SA_POP
 
-   libout = $(SAPOP_ROOT)/lib
+//   libout = $(SAPOP_ROOT)/lib
 
-   libpaths += $(SAPOP_ROOT)/lib
+//   libpaths += $(SAPOP_ROOT)/lib
 
-   after += SAPOP_XML_Utils
+//   after += SAPOP_XML_Utils
 
 
-   includes += $(SAPOP_ROOT) \
-               $(SAPOP_ROOT)/Standalone/XML_Utils
+   includes += $(SAPOP_ROOT)
+//               $(SAPOP_ROOT)/Standalone/XML_Utils
 
    macros = SA_POP_HAS_ACE
 
@@ -22,7 +22,7 @@ project(SA_POP) : xerces, acelib {
                     LOGSCREENOUT_BUILD_DLL \
 		    LOGGRAPHOUT_BUILD_DLL
 
-   libs += SAPOP_XML_Utils
+//   libs += SAPOP_XML_Utils
 
 
    Header_Files {
diff --git a/SA_POP/Standalone/SAPOP_Demo.mpc b/SA_POP/Standalone/SAPOP_Demo.mpc
index 50c53a9554f..233f075c25d 100644
--- a/SA_POP/Standalone/SAPOP_Demo.mpc
+++ b/SA_POP/Standalone/SAPOP_Demo.mpc
@@ -1,18 +1,16 @@
-project(SA_POP_Demo) : xerces, aceexe {
+project(SA_POP_Demo) : xerces, aceexe, sapop_core_standalone {
   exename = SA_POP_Demo
 
-  after += SA_POP
+//  after += SA_POP
 
-  includes += $(SAPOP_ROOT) \
-              $(SAPOP_ROOT)/Standalone/XML_Utils
+//  includes += $(SAPOP_ROOT) \
+// //              $(SAPOP_ROOT)/Standalone/XML_Utils
 
-  libpaths += $(SAPOP_ROOT)/lib
+//  libpaths += $(SAPOP_ROOT)/lib
 
-  libs += SA_POP
+//  libs += SA_POP
 
-//  dynamicflags = CIAO_XML_UTILS_BUILD_DLL
-
-//  macros = SA_POP_HAS_ACE
+// //  macros = SA_POP_HAS_ACE
 
   Source_Files {
     SA_POP_Demo.cpp
diff --git a/SA_POP/Standalone/XML_Utils/XML/XML.mpc b/SA_POP/Standalone/XML_Utils/XML/XML.mpc
index 458f256e4c4..1daeaccd7f6 100644
--- a/SA_POP/Standalone/XML_Utils/XML/XML.mpc
+++ b/SA_POP/Standalone/XML_Utils/XML/XML.mpc
@@ -1,9 +1,9 @@
 // $Id$
 
-project (SAPOP_XML_Utils) : acelib, xerces {
+project (SAPOP_XML_Utils) : acelib, xerces, sapop_out {
   sharedname   += SAPOP_XML_Utils
 
-  libout = $(SAPOP_ROOT)/lib
+//  libout = $(SAPOP_ROOT)/lib
 
   includes += ..