Changed include lines from "JAWS/server/..." to "apps/JAWS/server/..."

to fix an error reported by Rob Payne <repayne@jeeves.net>.

16 files changed, 30 insertions, 32 deletions

diff --git a/apps/JAWS/server/HTTP_Config.cpp b/apps/JAWS/server/HTTP_Config.cpp
index 52eb90051f3..b04881c1023 100644
--- a/apps/JAWS/server/HTTP_Config.cpp
+++ b/apps/JAWS/server/HTTP_Config.cpp
@@ -3,7 +3,7 @@
 
 #include "ace/OS.h"
 
-#include "JAWS/server/HTTP_Config.h"
+#include "apps/JAWS/server/HTTP_Config.h"
 
 static HTTP_Config_Info config_info;
 HTTP_Config_Info * HTTP_Config::instance_ = 0;
diff --git a/apps/JAWS/server/HTTP_Handler.cpp b/apps/JAWS/server/HTTP_Handler.cpp
index eed5b4d208d..1f7e3a104d8 100644
--- a/apps/JAWS/server/HTTP_Handler.cpp
+++ b/apps/JAWS/server/HTTP_Handler.cpp
@@ -4,10 +4,10 @@
 
 #include "ace/Message_Block.h"
 
-#include "JAWS/server/HTTP_Handler.h"
-#include "JAWS/server/HTTP_Helpers.h"
-#include "JAWS/server/IO.h"
-#include "JAWS/server/JAWS_File.h"
+#include "apps/JAWS/server/HTTP_Handler.h"
+#include "apps/JAWS/server/HTTP_Helpers.h"
+#include "apps/JAWS/server/IO.h"
+#include "apps/JAWS/server/JAWS_File.h"
 
 HTTP_Handler::HTTP_Handler (JAWS_IO &io,
 			    HTTP_Handler_Factory &factory)
diff --git a/apps/JAWS/server/HTTP_Handler.h b/apps/JAWS/server/HTTP_Handler.h
index c66cc00f655..555066e8641 100644
--- a/apps/JAWS/server/HTTP_Handler.h
+++ b/apps/JAWS/server/HTTP_Handler.h
@@ -10,9 +10,9 @@ class Message_Block;
 class HTTP_Handler_Factory;
 
 #include "ace/Asynch_IO.h"
-#include "JAWS/server/HTTP_Request.h"
-#include "JAWS/server/HTTP_Response.h"
-#include "JAWS/server/IO.h"
+#include "apps/JAWS/server/HTTP_Request.h"
+#include "apps/JAWS/server/HTTP_Response.h"
+#include "apps/JAWS/server/IO.h"
 
 class HTTP_Handler : protected JAWS_IO_Handler
   //
diff --git a/apps/JAWS/server/HTTP_Helpers.cpp b/apps/JAWS/server/HTTP_Helpers.cpp
index 98b260a27e8..d1ea9090dfd 100644
--- a/apps/JAWS/server/HTTP_Helpers.cpp
+++ b/apps/JAWS/server/HTTP_Helpers.cpp
@@ -2,7 +2,7 @@
 
 // HTTP_Helpers.cpp -- Helper utilities for both server and client
 
-#include "JAWS/server/HTTP_Helpers.h"
+#include "apps/JAWS/server/HTTP_Helpers.h"
 
 // = Static initialization.
 const char * const
diff --git a/apps/JAWS/server/HTTP_Request.cpp b/apps/JAWS/server/HTTP_Request.cpp
index 80094d0dd8d..52ecac46bed 100644
--- a/apps/JAWS/server/HTTP_Request.cpp
+++ b/apps/JAWS/server/HTTP_Request.cpp
@@ -2,9 +2,9 @@
 
 #include "ace/Message_Block.h"
 
-#include "JAWS/server/HTTP_Request.h"
-#include "JAWS/server/HTTP_Helpers.h"
-#include "JAWS/server/HTTP_Config.h"
+#include "apps/JAWS/server/HTTP_Request.h"
+#include "apps/JAWS/server/HTTP_Helpers.h"
+#include "apps/JAWS/server/HTTP_Config.h"
 
 const char * const
 HTTP_Request::static_header_strings_[HTTP_Request::NUM_HEADER_STRINGS]
diff --git a/apps/JAWS/server/HTTP_Request.h b/apps/JAWS/server/HTTP_Request.h
index 018cf2878f6..a7801c227e4 100644
--- a/apps/JAWS/server/HTTP_Request.h
+++ b/apps/JAWS/server/HTTP_Request.h
@@ -8,7 +8,7 @@
 class ACE_Message_Block;
 
 #include "ace/OS.h"
-#include "JAWS/server/Parse_Headers.h"
+#include "apps/JAWS/server/Parse_Headers.h"
 
 class HTTP_Request 
 {
diff --git a/apps/JAWS/server/HTTP_Response.cpp b/apps/JAWS/server/HTTP_Response.cpp
index 653979ee1c5..b8334d9c18c 100644
--- a/apps/JAWS/server/HTTP_Response.cpp
+++ b/apps/JAWS/server/HTTP_Response.cpp
@@ -16,11 +16,11 @@
 
 #include "ace/Process.h"
 
-#include "JAWS/server/HTTP_Response.h"
-#include "JAWS/server/HTTP_Request.h"
-#include "JAWS/server/HTTP_Helpers.h"
-#include "JAWS/server/HTTP_Config.h"
-#include "JAWS/server/IO.h"
+#include "apps/JAWS/server/HTTP_Response.h"
+#include "apps/JAWS/server/HTTP_Request.h"
+#include "apps/JAWS/server/HTTP_Helpers.h"
+#include "apps/JAWS/server/HTTP_Config.h"
+#include "apps/JAWS/server/IO.h"
 
 HTTP_Response::HTTP_Response (JAWS_IO &io, HTTP_Request &request)
   : io_(io), request_(request)
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 703b52fd11a..f3ed3da40ed 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -4,8 +4,8 @@
 #include "ace/Asynch_Acceptor.h"
 #include "ace/Proactor.h"
 
-#include "JAWS/server/IO.h"
-#include "JAWS/server/HTTP_Server.h"
+#include "apps/JAWS/server/IO.h"
+#include "apps/JAWS/server/HTTP_Server.h"
 
 void
 HTTP_Server::parse_args (int argc, char *argv[])
diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h
index b60cfdcf9fa..99cf30fd789 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -10,10 +10,10 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Task.h"
 #include "ace/Asynch_IO.h"
-#include "JAWS/server/HTTP_Handler.h"
+#include "apps/JAWS/server/HTTP_Handler.h"
 
 // Include the templates here.
-#include "JAWS/server/HTTP_Server_T.h"
+#include "apps/JAWS/server/HTTP_Server_T.h"
 
 // Forward declaration.
 class ACE_Proactor;
diff --git a/apps/JAWS/server/HTTP_Server_T.h b/apps/JAWS/server/HTTP_Server_T.h
index aa63e0fe0a5..85442cc61ad 100644
--- a/apps/JAWS/server/HTTP_Server_T.h
+++ b/apps/JAWS/server/HTTP_Server_T.h
@@ -20,7 +20,7 @@ private:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/server/HTTP_Server_T.cpp"
+#include "apps/JAWS/server/HTTP_Server_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index 25b232a4237..7efc49208e7 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "JAWS/server/IO.h"
-#include "JAWS/server/HTTP_Helpers.h"
-#include "JAWS/server/JAWS_File.h"
+#include "apps/JAWS/server/IO.h"
+#include "apps/JAWS/server/HTTP_Helpers.h"
+#include "apps/JAWS/server/JAWS_File.h"
 #include "ace/Message_Block.h"
 #include "ace/SOCK_Stream.h"
 
diff --git a/apps/JAWS/server/JAWS_File.cpp b/apps/JAWS/server/JAWS_File.cpp
index 8a32a6c4a82..048d1c509cc 100644
--- a/apps/JAWS/server/JAWS_File.cpp
+++ b/apps/JAWS/server/JAWS_File.cpp
@@ -13,7 +13,7 @@
 // 
 // ============================================================================
 
-#include "JAWS/server/JAWS_File.h"
+#include "apps/JAWS/server/JAWS_File.h"
 
 static const int R_MASK = S_IRUSR|S_IRGRP|S_IROTH;
 static const int W_MASK = S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH;
diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile
index 165d8084ece..99572a77070 100644
--- a/apps/JAWS/server/Makefile
+++ b/apps/JAWS/server/Makefile
@@ -25,8 +25,6 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 LOBJ	= $(addsuffix .o,$(FILES))
 SHOBJ	= $(addsuffix .so,$(FILES))
 
-INCLDIRS += -I../..
-
 LDLIBS	= $(addprefix .shobj/,$(SHOBJ))
  
 VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/apps/JAWS/server/Parse_Headers.h b/apps/JAWS/server/Parse_Headers.h
index e06cde86a16..0be498a7b77 100644
--- a/apps/JAWS/server/Parse_Headers.h
+++ b/apps/JAWS/server/Parse_Headers.h
@@ -18,7 +18,7 @@
 #if !defined (PARSE_HEADERS_H)
 #define PARSE_HEADERS_H
 
-#include <ace/OS.h>
+#include "ace/OS.h"
 
 class Headers_Map
 {
diff --git a/apps/JAWS/server/main.cpp b/apps/JAWS/server/main.cpp
index aeb1fbe50ec..44e267cb5d0 100644
--- a/apps/JAWS/server/main.cpp
+++ b/apps/JAWS/server/main.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/Service_Config.h"
-#include "JAWS/server/HTTP_Server.h"
+#include "apps/JAWS/server/HTTP_Server.h"
 
 ACE_STATIC_SVC_REQUIRE(HTTP_Server)
 
diff --git a/apps/JAWS/server/test_JAWS_File.cpp b/apps/JAWS/server/test_JAWS_File.cpp
index 352f332689a..cc074a85ca0 100644
--- a/apps/JAWS/server/test_JAWS_File.cpp
+++ b/apps/JAWS/server/test_JAWS_File.cpp
@@ -1,6 +1,6 @@
 // test_JAWS_File.cpp
 
-#include "JAWS/server/JAWS_File.h"
+#include "apps/JAWS/server/JAWS_File.h"
 
 const char *message = "this is the contents of a new testfile\n";