12 files changed, 54 insertions, 33 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index d1d8c8472a5..ee5adc7cb6c 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,24 @@
+Mon Sep 12 17:34:47 CDT 2005 Stoyan Paunov <spaunov@isis.vanderbilt.edu>
+
+	* tools/Config_Handlers/XMLSchema/Traversal.hpp
+	* tools/Config_Handlers/XMLSchema/TypeInfo.hpp
+	* tools/Config_Handlers/XMLSchema/Types.hpp
+	* tools/Config_Handlers/XMLSchema/Writer.hpp
+	* tools/Config_Handlers/XSCRT/Elements.hpp
+	* tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
+	* tools/Config_Handlers/XSCRT/Parser.hpp
+	* tools/Config_Handlers/XSCRT/Traversal.hpp
+	* tools/Config_Handlers/XSCRT/Writer.hpp
+	* tools/Config_Handlers/XSCRT/XML.hpp
+	* tools/Config_Handlers/XSCRT/XMLSchema.hpp
+
+	Fixed a number of problems related to Will's changes. The XSC_Config_Handler_Tests
+	project was not compiling. I had the same problem in RepositoryManager. Will had 
+	changed the directory structure, but did not update any of the include paths. 
+	Needless to say there were like 30-40 of those in the XSCRT and XMLSchema directories
+	
+
+
 Fri Sep  9 12:32:14 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* ciao/CCM_Core.mpc
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.hpp
index b435bb4370f..51f80707591 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.hpp
@@ -5,8 +5,8 @@
 #ifndef XMLSCHEMA_TRAVERSAL_HPP
 #define XMLSCHEMA_TRAVERSAL_HPP
 
-#include <XSCRT/Traversal.hpp>
-#include <XMLSchema/Types.hpp>
+#include <ciao/tools/Config_Handlers/XSCRT/Traversal.hpp>
+#include <ciao/tools/Config_Handlers/XMLSchema/Types.hpp>
 
 namespace XMLSchema
 {
@@ -66,7 +66,7 @@ namespace XMLSchema
   }
 }
 
-#include <XMLSchema/Traversal.ipp>
-#include <XMLSchema/Traversal.tpp>
+#include <ciao/tools/Config_Handlers/XMLSchema/Traversal.ipp>
+#include <ciao/tools/Config_Handlers/XMLSchema/Traversal.tpp>
 
 #endif  // XMLSCHEMA_TRAVERSAL_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.hpp
index e4fa52dbb9c..fa6f137c1c2 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.hpp
@@ -5,7 +5,7 @@
 #ifndef XMLSCHEMA_TYPE_INFO_HPP
 #define XMLSCHEMA_TYPE_INFO_HPP
 
-#include <XSCRT/ExtendedTypeInfo.hpp>
+#include <ciao/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp>
 
 namespace XMLSchema
 {
@@ -16,7 +16,7 @@ namespace XMLSchema
   };
 }
 
-#include <XMLSchema/TypeInfo.ipp>
-#include <XMLSchema/TypeInfo.tpp>
+#include <ciao/tools/Config_Handlers/XMLSchema/TypeInfo.ipp>
+#include <ciao/tools/Config_Handlers/XMLSchema/TypeInfo.tpp>
 
 #endif  // XMLSCHEMA_TYPE_INFO_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
index 12c8b00eca0..141d0039de2 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
@@ -6,7 +6,7 @@
 #define XMLSCHEMA_TYPES_HPP
 
 #include <string>
-#include "XSCRT/Elements.hpp"
+#include "ciao/tools/Config_Handlers/XSCRT/Elements.hpp"
 
 /**
  * @@ HACK: VC7
@@ -577,7 +577,7 @@ namespace XMLSchema
   };
 }
 
-#include "XMLSchema/Types.ipp"
-#include "XMLSchema/Types.tpp"
+#include "ciao/tools/Config_Handlers/XMLSchema/Types.ipp"
+#include "ciao/tools/Config_Handlers/XMLSchema/Types.tpp"
 
 #endif  // XMLSCHEMA_TYPES_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
index c8dca806caf..5ed7189e489 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
@@ -7,10 +7,10 @@
 
 #include <sstream>
 
-#include <XSCRT/Writer.hpp>
+#include <ciao/tools/Config_Handlers/XSCRT/Writer.hpp>
 
-#include <XMLSchema/Types.hpp>
-#include <XMLSchema/Traversal.hpp>
+#include <ciao/tools/Config_Handlers/XMLSchema/Types.hpp>
+#include <ciao/tools/Config_Handlers/XMLSchema/Traversal.hpp>
 
 namespace XMLSchema
 {
@@ -90,7 +90,7 @@ namespace XMLSchema
   }
 }
 
-#include <XMLSchema/Writer.ipp>
-#include <XMLSchema/Writer.tpp>
+#include <ciao/tools/Config_Handlers/XMLSchema/Writer.ipp>
+#include <ciao/tools/Config_Handlers/XMLSchema/Writer.tpp>
 
 #endif  // XMLSCHEMA_WRITER_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
index 1afe0911eca..2a415d42851 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
@@ -10,7 +10,7 @@
 #include <sstream>
 // #include <iostream> //@@ tmp
 
-#include "XSCRT/Parser.hpp"
+#include "ciao/tools/Config_Handlers/XSCRT/Parser.hpp"
 
 #if defined (_MSC_VER) && (_MSC_VER < 1300)
 
@@ -646,7 +646,7 @@ namespace XSCRT
 
 }
 
-#include "XSCRT/Elements.ipp"
-#include "XSCRT/Elements.tpp"
+#include "ciao/tools/Config_Handlers/XSCRT/Elements.ipp"
+#include "ciao/tools/Config_Handlers/XSCRT/Elements.tpp"
 
 #endif  // XSCRT_ELEMENTS_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
index 51f1930eea9..4d3741a1911 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
@@ -177,6 +177,6 @@ namespace XSCRT
   }
 }
 
-#include <XSCRT/ExtendedTypeInfo.ipp>
+#include <ciao/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp>
 
 #endif  // XSCRT_EXTENDED_TYPE_INFO_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
index 66fd4b6db5c..ca3014dd094 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "XSCRT/XML.hpp"
+#include "ciao/tools/Config_Handlers/XSCRT/XML.hpp"
 
 namespace XSCRT
 {
@@ -62,7 +62,7 @@ namespace XSCRT
   };
 }
 
-#include "XSCRT/Parser.ipp"
-#include "XSCRT/Parser.tpp"
+#include "ciao/tools/Config_Handlers/XSCRT/Parser.ipp"
+#include "ciao/tools/Config_Handlers/XSCRT/Parser.tpp"
 
 #endif  // XSCRT_PARSER_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp
index f66b6be1ab6..e2179d5d48c 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp
@@ -13,7 +13,7 @@
 // using std::wcerr;
 // using std::endl;
 
-#include "XSCRT/ExtendedTypeInfo.hpp"
+#include "ciao/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp"
 
 namespace XSCRT
 {
@@ -269,7 +269,7 @@ namespace XSCRT
   }
 }
 
-#include <XSCRT/Traversal.ipp>
-#include <XSCRT/Traversal.tpp>
+#include <ciao/tools/Config_Handlers/XSCRT/Traversal.ipp>
+#include <ciao/tools/Config_Handlers/XSCRT/Traversal.tpp>
 
 #endif  // XSCRT_TRAVERSAL_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Writer.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Writer.hpp
index 6fdd82f6f3e..dcdfe0722ec 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Writer.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Writer.hpp
@@ -8,7 +8,7 @@
 #include <stack>
 #include <string>
 
-#include "XSCRT/XML.hpp"
+#include "ciao/tools/Config_Handlers/XSCRT/XML.hpp"
 
 namespace XSCRT
 {
@@ -75,7 +75,7 @@ namespace XSCRT
   };
 }
 
-#include <XSCRT/Writer.ipp>
-#include <XSCRT/Writer.tpp>
+#include <ciao/tools/Config_Handlers/XSCRT/Writer.ipp>
+#include <ciao/tools/Config_Handlers/XSCRT/Writer.tpp>
 
 #endif  // XSCRT_WRITER_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
index 4b440803a0f..c895bda2ee6 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
@@ -465,7 +465,7 @@ namespace XSCRT
   }
 }
 
-#include "XSCRT/XML.ipp"
-#include "XSCRT/XML.tpp"
+#include "ciao/tools/Config_Handlers/XSCRT/XML.ipp"
+#include "ciao/tools/Config_Handlers/XSCRT/XML.tpp"
 
 #endif  // XSCRT_XML_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
index 31bad0bc207..44ec3bb5440 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
@@ -8,7 +8,7 @@
 #include <string>
 // #include <iostream> //@@ tmp
 
-#include "XSCRT/Elements.hpp"
+#include "ciao/tools/Config_Handlers/XSCRT/Elements.hpp"
 
 namespace XMLSchema
 {
@@ -558,7 +558,7 @@ namespace XMLSchema
   };
 }
 
-#include "XSCRT/XMLSchema.ipp"
-#include "XSCRT/XMLSchema.tpp"
+#include "ciao/tools/Config_Handlers/XSCRT/XMLSchema.ipp"
+#include "ciao/tools/Config_Handlers/XSCRT/XMLSchema.tpp"
 
 #endif  // XSCRT_XMLSCHEMA_HPP