ChangeLogTag:Thu May 09 12:12:59 2002 Nanbor Wang <nanbor@cs.wustl.edu>

9 files changed, 60 insertions, 9 deletions

diff --git a/ACEXML/apps/svcconf/Makefile b/ACEXML/apps/svcconf/Makefile
index fced65f587e..5a98fa294e8 100644
--- a/ACEXML/apps/svcconf/Makefile
+++ b/ACEXML/apps/svcconf/Makefile
@@ -14,7 +14,6 @@ DEFS    = $(addsuffix .h,$(FILES))
 LSRC    = $(addsuffix .cpp,$(FILES))
 
 LIBS   +=  -lACEXML_Parser -lACEXML $(ACELIB)
-CCFLAGS += -I../..
 
 BUILD   = $(VLIB) $(VSHLIB)
 
diff --git a/ACEXML/apps/svcconf/Svcconf.cpp b/ACEXML/apps/svcconf/Svcconf.cpp
index 919b5f39818..a720811ffde 100644
--- a/ACEXML/apps/svcconf/Svcconf.cpp
+++ b/ACEXML/apps/svcconf/Svcconf.cpp
@@ -2,9 +2,11 @@
 
 
 #include "Svcconf.h"
-#include "common/FileCharStream.h"
-#include "common/StrCharStream.h"
-#include "parser/parser/Parser.h"
+#include "ACEXML/common/FileCharStream.h"
+#include "ACEXML/common/StrCharStream.h"
+#include "ACEXML/parser/parser/Parser.h"
+
+#if (ACE_USES_CLASSIC_SVC_CONF == 0)
 
 extern "C" ACE_Proper_Export_Flag ACE_XML_Svc_Conf *
 _ACEXML_create_XML_Svc_Conf_Object (void)
@@ -93,3 +95,5 @@ ACEXML_Svcconf_Parser::parse_string (const ACE_TCHAR str[])
     }
   return 0;
 }
+
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */
diff --git a/ACEXML/apps/svcconf/Svcconf.h b/ACEXML/apps/svcconf/Svcconf.h
index 0775658dac5..63b4c6df972 100644
--- a/ACEXML/apps/svcconf/Svcconf.h
+++ b/ACEXML/apps/svcconf/Svcconf.h
@@ -16,9 +16,10 @@
 
 #include "ace/pre.h"
 #include "ace/XML_Svc_Conf.h"
-#include "parser/parser/Parser.h"
+#include "ACEXML/parser/parser/Parser.h"
 #include "Svcconf_Handler.h"
 
+#if (ACE_USES_CLASSIC_SVC_CONF == 0)
 
 class ACEXML_Svcconf_Parser : public ACE_XML_Svc_Conf
 {
@@ -42,5 +43,7 @@ protected:
   ACEXML_Env env_;
 };
 
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */
+
 #include "ace/post.h"
 #endif /* ACEXML_SVCCONF_H */
diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index 87a908f067e..13eac87345c 100644
--- a/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -10,6 +10,8 @@
 #include "ace/ARGV.h"
 #include "ace/Module.h"
 
+#if (ACE_USES_CLASSIC_SVC_CONF == 0)
+
 #if !defined (__ACEXML_INLINE__)
 # include "Svcconf_Handler.i"
 #endif /* __ACEXML_INLINE__ */
@@ -669,3 +671,5 @@ ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist,
     }
   return 0;
 }
+
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */
diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.h b/ACEXML/apps/svcconf/Svcconf_Handler.h
index 22069f8b97f..ede5cb1290f 100644
--- a/ACEXML/apps/svcconf/Svcconf_Handler.h
+++ b/ACEXML/apps/svcconf/Svcconf_Handler.h
@@ -13,9 +13,11 @@
 #ifndef ACEXML_SVCCONF_HANDLER_H
 #define ACEXML_SVCCONF_HANDLER_H
 
-#include "common/DefaultHandler.h"
+#include "ACEXML/common/DefaultHandler.h"
 #include "ace/Service_Types.h"
 
+#if (ACE_USES_CLASSIC_SVC_CONF == 0)
+
 class ACE_Parsed_Info
 {
 public:
@@ -302,4 +304,7 @@ private:
 #if defined (__ACEXML_INLINE__)
 # include "Svcconf_Handler.i"
 #endif /* __ACEXML_INLINE__ */
+
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */
+
 #endif /* ACEXML_SVCCONF_HANDLER_H */
diff --git a/ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp b/ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp
index 1560ec4e6de..55aa371f363 100644
--- a/ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp
+++ b/ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_SVC_CONF_PARSER_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_SVC_CONF_PARSER_EXPORTS" /YX /FD   /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD   /c

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_SVC_CONF_PARSER_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/ChangeLog b/ChangeLog
index e6b2e4343ea..f730ab1b4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu May 09 12:12:59 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ACEXML/apps/svcconf/Svcconf.h:
+	* ACEXML/apps/svcconf/Svcconf.cpp:
+	* ACEXML/apps/svcconf/Svcconf_Handler.h:
+	* ACEXML/apps/svcconf/Svcconf_Handler.cpp: Commented out the code
+	  if XML-based Service Configurator is not used.
+
+	* ACEXML/apps/svcconf/Makefile:
+	* ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: Removed ACEXML from
+	  the list of include path to be consistent with other projects.
+
 Thu May 09 10:53:51 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/XML_Common.dsp: One more mis-merged project file.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index e6b2e4343ea..f730ab1b4a6 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Thu May 09 12:12:59 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ACEXML/apps/svcconf/Svcconf.h:
+	* ACEXML/apps/svcconf/Svcconf.cpp:
+	* ACEXML/apps/svcconf/Svcconf_Handler.h:
+	* ACEXML/apps/svcconf/Svcconf_Handler.cpp: Commented out the code
+	  if XML-based Service Configurator is not used.
+
+	* ACEXML/apps/svcconf/Makefile:
+	* ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: Removed ACEXML from
+	  the list of include path to be consistent with other projects.
+
 Thu May 09 10:53:51 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/XML_Common.dsp: One more mis-merged project file.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e6b2e4343ea..f730ab1b4a6 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Thu May 09 12:12:59 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ACEXML/apps/svcconf/Svcconf.h:
+	* ACEXML/apps/svcconf/Svcconf.cpp:
+	* ACEXML/apps/svcconf/Svcconf_Handler.h:
+	* ACEXML/apps/svcconf/Svcconf_Handler.cpp: Commented out the code
+	  if XML-based Service Configurator is not used.
+
+	* ACEXML/apps/svcconf/Makefile:
+	* ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: Removed ACEXML from
+	  the list of include path to be consistent with other projects.
+
 Thu May 09 10:53:51 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/XML_Common.dsp: One more mis-merged project file.