2003-01-22 Manuel Guesdon <mguesdon@orange-concept.com>

* GSWeb.framework/Makefile.postamble: o use $(LN_S) -f in install-WO-headers o added $(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR); * GSWExtensionsGSW.framework/Makefile.postamble: use $(LN_S) -f in install-WO-headers 2003-01-20 David Ayers <d.ayers@inode.at> * Makefile.postamble o added support for make gswnames=(gsw,wo,all) (corrected typo) o reinserted support for $(INSTALL_ROOT_DIR) * config.h.in o added HAVE_GDL2 * configure o added support for --with-gswnames=(gsw,wo,all) o set LIBWRAP during configure o added config.mak.in as configurable file * configure.ac o (see configure) * config.mak: removed (replaced by config.mak.in) * config.mak.in: new file o added support for make gswnames=(gsw,wo,all) * gsweb.make.in o add GSANTLR as auxiliary lib o add gsweb libs to AUXILIARY_GSW_LIBS o include correct extensions for GSW/WO-libs * gsweb_wo.make: new file * GSWeb/GSWConfig.h o changed support for GSWEB_WONAMES o conditionally import file GSWWOCompatiblity here instead of in GSWeb.h * GSWeb/GNUMakefile o added support for make gswnames=(gsw,wo,all) o ensure each lib gets built with its own object files o removed deactivated framework extension determination code o removed reference to unused files: GSWeb.m, GSWWOCompatibility.m o added references to new files: GSWExtenstions.h, GSWExtWOCompatibility.h o added support to create WO header files * GSWeb/Makefile.postamble o changed support to install WO header files according to make gswnames=(gsw,wo,all) o remove Makefile.preamble during distclean * GSWeb/Makefile.preamble.in o fixed typo * GSWeb/GSWeb.h o moved GSW/WO-Name-mapping to GSWWOCompatibility.h o replaced inclusions of <GSWeb/file.h> with "file.h" * GSWeb/GSWeb.m: removed * GSWeb/GSWWOCompatibility.h o changed GSWEB_WONAMES handling o removed hybrid namespace WO subclasses o moved & reorganized GSW/WO-Name-mapping from GSWeb.h o inlucluded missing GSW/WO-Name-mappings * GSWeb/GSWWOCompatibility.m: removed * GSWeb/*.m o replaced inclusions of <GSWeb/file.h> with "file.h" * GSWeb/GSWApplication.m o remove special GSW/WO handling of WOApp * GSWeb/WebObject/WO*: removed * GSWeb/WebObject/WebObjects o replaced inclusions of <GSWeb/file.h> with "file.h" * GSWExtensions/GNUMakefile o added support for make gswnames=(gsw,wo,all) o ensure each lib gets built with its own object files o removed deactivated framework extension determination code o added references to new files: GSWExtenstions.h, GSWExtWOCompatibility.h o added support to create WO header files * GSWExtensions/Makefile.preamble o let gnustep make figure whether to link agains debug libs o added support for make gswnames=(gsw,wo,all) * GSWExtensions/Makefile.postamble o changed support to install WO header files according to make gswnames=(gsw,wo,all) * GSWExtensions/*.m o replaced inclusions of <GSWeb/GSWeb.h> with "GSWExtWOCompatibility.h" o replaces inclusions of <GSWExtensions/file.h> with "file.h" * GSWExtensions/GSWExtensions.h: new file * GSWExtensions/WOExtensions.h: new file * GSWExtensions/GSWExtWOCompatibility.h: new file * GSWExtensionsGSW/GNUMakefile o added support for make gswnames=(gsw,wo,all) o ensure each lib gets built with its own object files o removed deactivated framework extension determination code o added references to new file GSWExtGSWWOCompatibility.h o added support to create WO header files * GSWExtensionsGSW/Makefile.pramble o let gnustep make figure whether to link agains debug libs o added support for make gswnames=(gsw,wo,all) o removed GSWExtensions from ADDITIONAL_LIB_DIRS * GSWExtensionsGSW/*.m o replaced inclusions of <GSWeb/GSWeb.h> with "GSWExtGSWWOCompatibility.h" * GSWExtensions/GSWExtGSWWOCompatibility.h: new file git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15675 72102866-910b-0410-8b05-ffd578937521
2025-04-22 23:11:15 +00:00 · 2003-01-22 12:24:26 +00:00 · 2003-01-22 12:24:26 +00:00 · 81e6793323
commit 81e6793323
parent 0746bae903
160 changed files with 971 additions and 644 deletions
--- a/143
+++ b/143
@ -1,3 +1,105 @@
+2003-01-22   Manuel Guesdon <mguesdon@orange-concept.com>
+	* GSWeb.framework/Makefile.postamble: 
+		o use $(LN_S) -f in install-WO-headers
+		o added $(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR);
+	* GSWExtensionsGSW.framework/Makefile.postamble: use $(LN_S) -f in install-WO-headers
+
+2003-01-20   David Ayers <d.ayers@inode.at>
+	* Makefile.postamble
+		o added support for make gswnames=(gsw,wo,all) (corrected
+		typo)
+		o reinserted support for $(INSTALL_ROOT_DIR) 
+	* config.h.in
+		o added HAVE_GDL2
+	* configure
+		o added support for --with-gswnames=(gsw,wo,all)
+		o set LIBWRAP during configure
+		o added config.mak.in as configurable file        
+	* configure.ac
+		o (see configure)
+	* config.mak: removed (replaced by config.mak.in)
+	* config.mak.in: new file
+		o added support for make gswnames=(gsw,wo,all)
+	* gsweb.make.in
+		o add GSANTLR as auxiliary lib
+		o add gsweb libs to AUXILIARY_GSW_LIBS
+		o include correct extensions for GSW/WO-libs
+	* gsweb_wo.make: new file
+	* GSWeb/GSWConfig.h
+		o changed support for GSWEB_WONAMES
+		o conditionally import file GSWWOCompatiblity
+		  here instead of in GSWeb.h
+	* GSWeb/GNUMakefile
+		o added support for make gswnames=(gsw,wo,all)
+		o ensure each lib gets built with its own object files
+		o removed deactivated framework extension determination code
+		o removed reference to unused files:
+		  GSWeb.m, GSWWOCompatibility.m
+		o added references to new files:
+		  GSWExtenstions.h, GSWExtWOCompatibility.h
+		o added support to create WO header files
+	* GSWeb/Makefile.postamble
+		o changed support to install WO header files according to
+	          make gswnames=(gsw,wo,all)
+		o remove Makefile.preamble during distclean
+	* GSWeb/Makefile.preamble.in
+		o fixed typo
+	* GSWeb/GSWeb.h
+		o moved GSW/WO-Name-mapping to GSWWOCompatibility.h
+		o replaced inclusions of
+		  <GSWeb/file.h> with "file.h"
+	* GSWeb/GSWeb.m: removed
+	* GSWeb/GSWWOCompatibility.h
+		o changed GSWEB_WONAMES handling
+		o removed hybrid namespace WO subclasses
+		o moved & reorganized GSW/WO-Name-mapping from GSWeb.h
+		o inlucluded missing GSW/WO-Name-mappings
+	* GSWeb/GSWWOCompatibility.m: removed
+	* GSWeb/*.m
+		o replaced inclusions of
+		  <GSWeb/file.h> with "file.h"
+	* GSWeb/GSWApplication.m
+		o remove special GSW/WO handling of WOApp
+	* GSWeb/WebObject/WO*: removed
+	* GSWeb/WebObject/WebObjects
+		o replaced inclusions of
+		  <GSWeb/file.h> with "file.h"
+	* GSWExtensions/GNUMakefile
+		o added support for make gswnames=(gsw,wo,all)
+		o ensure each lib gets built with its own object files
+		o removed deactivated framework extension determination code
+		o added references to new files:
+		  GSWExtenstions.h, GSWExtWOCompatibility.h
+		o added support to create WO header files
+	* GSWExtensions/Makefile.preamble
+		o let gnustep make figure whether to link agains debug libs
+		o added support for make gswnames=(gsw,wo,all)
+	* GSWExtensions/Makefile.postamble
+		o changed support to install WO header files according to
+	          make gswnames=(gsw,wo,all)
+	* GSWExtensions/*.m
+		o replaced inclusions of
+		  <GSWeb/GSWeb.h> with "GSWExtWOCompatibility.h"
+		o replaces inclusions of
+		  <GSWExtensions/file.h> with "file.h"
+	* GSWExtensions/GSWExtensions.h: new file
+	* GSWExtensions/WOExtensions.h: new file
+	* GSWExtensions/GSWExtWOCompatibility.h: new file
+	* GSWExtensionsGSW/GNUMakefile
+		o added support for make gswnames=(gsw,wo,all)
+		o ensure each lib gets built with its own object files
+		o removed deactivated framework extension determination code
+		o added references to new file GSWExtGSWWOCompatibility.h
+		o added support to create WO header files
+	* GSWExtensionsGSW/Makefile.pramble
+		o let gnustep make figure whether to link agains debug libs
+		o added support for make gswnames=(gsw,wo,all)
+	        o removed GSWExtensions from ADDITIONAL_LIB_DIRS
+	* GSWExtensionsGSW/*.m
+		o replaced inclusions of
+		  <GSWeb/GSWeb.h> with "GSWExtGSWWOCompatibility.h"
+	* GSWExtensions/GSWExtGSWWOCompatibility.h: new file
+	
 2003-01-19   Manuel Guesdon <mguesdon@orange-concept.com>
 	* GSWeb/GSWApplication.m
 		o removed unused +initialize
@ -5,12 +107,12 @@
 		o more information on "bad request first line" exception
 	* GSWeb/GSWHTMLDynamicElement.m
 		o in -initWithName:attributeAssociations:contentElements:
-			add "" to association values because XML parser romove them.
+		  add "" to association values because XML parser romove them.
 		o added -computeActionStringWithActionClassAssociation:
-				directActionNameAssociation:inContext:
+		  directActionNameAssociation:inContext:
 		o added -computeQueryDictionaryWithActionClassAssociation:
-				directActionNameAssociation:queryDictionaryAssociation:
-				otherQueryAssociations:inContext:
+		  directActionNameAssociation:queryDictionaryAssociation:
+		  otherQueryAssociations:inContext:
 	* GSWeb/GSWResponse.m:
 		o don't append debugcomment if !GSDebugSet(@"debugComments")
 		o fixed bug in appendContentString: in NSAssert3 params
@ -20,12 +122,14 @@
 		o added -forceFinalizeInContext
 		o added GSWResponse (GSWResponseRedirected)
 	* GSWeb/GSWTemplateParserXML.m:
-		o only include comments if [GSWApplication includeCommentsInResponses]
+		o only include comments if
+		  [GSWApplication includeCommentsInResponses]
 	* GSWExtensions.framework/GSWLongResponsePage.m:
 		o in -cancel call cancelPageForStatus: instead of cancelPage
 		o declare private interface
 	* GSWeb/GSWComponent.m:
-		o don't output end of component commend if !DEBUG && !GSDebugSet(@"gswcomponents")
+		o don't output end of component commend
+		  if !DEBUG && !GSDebugSet(@"gswcomponents")
 		o fixes in _generateResponseInContext:
 	* GSWeb/GSWContext.[hm]:
 		o added _userInfo to enable developper context specific 
@ -37,7 +141,8 @@
 		o added -_directActionURLForActionNamed:queryDictionary:isSecure:url:
 		o added -componentActionURLIsSecure:
 		o modified -session
-		o modified -_takeAwakeComponent: to not add already added component 
+		o modified -_takeAwakeComponent: to not add already added
+		  component 
 		o implemented _takeAwakeComponentsFromArray;
 		o fixed -_incrementContextID
 		o added _session
@ -48,7 +153,8 @@
 		o added _secure
 		o added binding validation tests
 		o fixes in -appendToResponse:inContext:
-		o handle correctly otherQueryAssociations (bindings starting with '?')
+		o handle correctly otherQueryAssociations
+		  (bindings starting with '?')
 	* GSWeb/GSWConstants.[hm]:
 		o added cidStore__Key for GSWHTMLURLValuedElement
 		o added cidKey__Key for GSWHTMLURLValuedElement
@ -68,22 +174,29 @@
 		o rewrite form/uri/cookie values retrieving (for sessionID,...)
 		o new use GSMimeParser for formData parsing
 	* Doc/antlr.txt added
-	* GSWeb/GSWPageDefParser.[hm] regenerated to handle (bindings starting with '?')
-	* GSWeb/GSWPageDefParserTokenTypes.txt regenerated to handle (bindings starting with '?')
-	* GSWeb/GSWPageDefParserTokenTypes.h regenerated to handle (bindings starting with '?')
-	* GSWeb/GSWPageDefLexer.[hm]  regenerated to handle (bindings starting with '?')
+	* GSWeb/GSWPageDefParser.[hm] regenerated to handle
+	  (bindings starting with '?')
+	* GSWeb/GSWPageDefParserTokenTypes.txt regenerated to handle
+	  (bindings starting with '?')
+	* GSWeb/GSWPageDefParserTokenTypes.h regenerated to handle
+	  (bindings starting with '?')
+	* GSWeb/GSWPageDefLexer.[hm]  regenerated to handle
+	  (bindings starting with '?')
 	* GSWeb/GSWUtils.[hm]:
 		o added -extractObjectsForKeysWithPrefix:removePrefix:
 		o fixed bug in HexStringToData
-		o fixed bug in NSDictionary +dictionaryWithArray:onSelector:withObject:
+		o fixed bug in NSDictionary
+		  +dictionaryWithArray:onSelector:withObject:
 	* GSWeb/GSWForm.[hm]
 		o handle otherQueryAssociations (bindings starting with '?')
 		o implemented -computeQueryDictionaryInContext:
 		o implemented/fixed -_appendHiddenFieldsToResponse:inContext:
 		o implemented -_appendCGIActionToResponse:inContext:
-		o fix -appendGSWebObjectsAssociationsToResponse:inContext: for directAction 
+		o fix -appendGSWebObjectsAssociationsToResponse:inContext:
+		  for directAction 
 		o added -computeActionStringInContext:
-		o fixed -invokeActionForRequest:inContext: to invoke action when to element is invoked
+		o fixed -invokeActionForRequest:inContext: to invoke
+		  action when to element is invoked
 	* GSWeb/GSWDirectAction.m:
 		o fixed -_initializeRequestSessionIDInContext:
 		o added -sessionIDForRequest:
--- a/GSWExtensions.framework/GNUmakefile
+++ b/GSWExtensions.framework/GNUmakefile
@ -33,12 +33,31 @@ include ../config.mak
 srcdir = .

 # The framework to be compiled
+
+# Options
+ifeq ($(gswnames), gsw)
 FRAMEWORK_NAME = GSWExtensions
+endif
+ifeq ($(gswnames), wo)
+FRAMEWORK_NAME = GSWExtensions_wo
+endif
+ifeq ($(gswnames), all)
+FRAMEWORK_NAME = GSWExtensions GSWExtensions_wo
+endif
+
+# Ensure that each framework uses its own GNUSTEP_OBJ_DIR & DERIVED_SRC
+ifneq ($(GNUSTEP_INSTANCE),)
+GNUSTEP_OBJ_DIR := $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)
+DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE)
+endif
+
+GSWExtensions_wo_CPPFLAGS = -DGSWEB_WONAMES

 # The framework resource files and directories
 GSWExtensions_RESOURCE_FILES = \
 Resources/Info-gnustep.plist \
 GSWSessionRestorationErrorPage.gswd
+GSWExtensions_wo_RESOURCE_FILES = $(GSWExtensions_RESOURCE_FILES)

 GSWExtensions_COMPONENTS = \
 GSWSessionCreationErrorPage.gswc \
@ -65,11 +84,14 @@ GSWRedirect.gswc
 #GSWToManyRelationship.gswc 
 #GSWPageRestorationErrorPage.gswc 
 #GSWToOneRelationship.gswc 
+GSWExtensions_wo_COMPONENTS = $(GSWExtensions_COMPONENTS)

 GSWExtensions_LANGUAGES = \
 French
+GSWExtensions_wo_LANGUAGES = $(GSWExtensions_LANGUAGES)

 GSWExtensions_RESOURCE_DIRS = 
+GSWExtensions_wo_RESOURCE_DIRS = $(GSWExtensions_RESOURCE_DIRS)

 GSWExtensions_WEBSERVER_RESOURCE_FILES = \
 Ascending.png \
@ -92,18 +114,7 @@ gswapp.png \
 gswappsrv.png \
 warning.mng \
 error.mng
-
-
-# Determine the bundle directory extension
-#ifeq ($(profile), yes)
-#  GSWBUNDLE_EXTENSION = .frameworkp
-#else
-#  ifeq ($(debug), yes)
-#    GSWBUNDLE_EXTENSION = .frameworkd
-#  else
-#    GSWBUNDLE_EXTENSION = .framework
-#  endif
-#endif
+GSWExtensions_wo_WEBSERVER_RESOURCE_FILES = $(GSWExtensions_WEBSERVER_RESOURCE_FILES)

 # The Objective-C source files to be compiled
 GSWExtensions_OBJC_FILES = \
@ -119,9 +130,12 @@ GSWMetaRefresh.m \
 GSWLongResponsePage.m \

 #GSWCompletionBar.m
+GSWExtensions_wo_OBJC_FILES = $(GSWExtensions_OBJC_FILES)

 # The header files to be installed
 GSWExtensions_HEADER_FILES = \
+GSWExtWOCompatibility.h \
+GSWExtensions.h \
 GSWCollapsibleComponentContent.h \
 GSWDictionaryRepetition.h \
 GSWExceptionPage.h \
@ -141,13 +155,24 @@ GSWLongResponsePage.h
 #GSWSimpleArrayDisplay.h
 #GSWSimpleArrayDisplay2.h
 #GSWBatchNavigationBar.h
+GSWExtensions_wo_HEADER_FILES = $(GSWExtensions_HEADER_FILES)
+
+WO_HEADER_FILES = \
+	WOLongResponsePage.h \
+	WORedirect.h
+
+# WOExtensions.h not needed as it gets copied explicitly
+
+GSWExtensions_HEADER_FILES_DIR = $(HEADER_DIR)
+GSWExtensions_wo_HEADER_FILES_DIR = $(HEADER_DIR)
+GSWExtensions_wo_HEADER_FILES_INSTALL_DIR = WOExtensions

 SRCS = $(LIBRARY_NAME:=.m)
 HDRS = $(LIBRARY_NAME:=.h)
+
 GSWExtensions_AUTOGSDOC_HEADERS = $(GSWExtensions_HEADER_FILES)
 GSWExtensions_AUTOGSDOC_SOURCE = $(GSWExtensions_OBJC_FILES)
 DOCUMENT_NAME = GSWExtensions
-GSWExtensions_HEADER_FILES_DIR = $(HEADER_DIR)
 GSWExtensions_AGSDOC_FILES = gswextensions.gsdoc $(GSWExtensions_AUTOGSDOC_HEADERS) 
 #$(GSWExtensions_AUTOGSDOC_SOURCE)
 GSWExtensions_AGSDOC_FLAGS = \
--- a/GSWExtensions.framework/GSWCollapsibleComponentContent.m
+++ b/GSWExtensions.framework/GSWCollapsibleComponentContent.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWCollapsibleComponentContent.h"

 //===================================================================================
--- a/GSWExtensions.framework/GSWDictionaryRepetition.m
+++ b/GSWExtensions.framework/GSWDictionaryRepetition.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWDictionaryRepetition.h"

 //====================================================================
--- a/GSWExtensions.framework/GSWExceptionPage.m
+++ b/GSWExtensions.framework/GSWExceptionPage.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWExceptionPage.h"

 //===================================================================================
--- a/GSWExtensions.framework/GSWExtWOCompatibility.h
+++ b/GSWExtensions.framework/GSWExtWOCompatibility.h
@ -0,0 +1,43 @@
+/** GSWExtWOCompatibility.h -  <title>GSWExtWOCompatibility</title>
+
+   Copyright (C) 1999-2002 Free Software Foundation, Inc.
+   
+   Written by:	David Ayers <d.ayers@inode.at>
+   Date: 	2002/11/11
+   
+   $Revision$
+   $Date$
+   
+   <abstract></abstract>
+
+   This file is part of the GNUstep Web Library.
+
+   <license>
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   </license>
+**/
+
+// $Id$
+
+#ifndef _GSWExtWOCompatibility_h__
+#define _GSWExtWOCompatibility_h__
+
+#ifndef GSWEB_WONAMES
+#include <GSWeb/GSWeb.h>
+#else
+#include <WebObjects/GSWeb.h>
+#endif
+
+#endif //_GSWExtWOCompatibility_h__
--- a/GSWExtensions.framework/GSWExtensions.h
+++ b/GSWExtensions.framework/GSWExtensions.h
@ -0,0 +1,50 @@
+/** GSWExtensions.h -  <title>GSWExtensions</title>
+
+   Copyright (C) 1999-2002 Free Software Foundation, Inc.
+   
+   Written by:	David Ayers <d.ayers@inode.at>
+   Date: 	2002/11/11
+   
+   $Revision$
+   $Date$
+   
+   <abstract></abstract>
+
+   This file is part of the GNUstep Web Library.
+
+   <license>
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   </license>
+**/
+
+// $Id$
+
+#ifndef _GSWExtensions_h__
+#define _GSWExtensions_h__
+
+#include "GSWExtWOCompatibility.h"
+
+#include "GSWCollapsibleComponentContent.h"
+#include "GSWDictionaryRepetition.h"
+#include "GSWExceptionPage.h"
+#include "GSWIFrame.h"
+#include "GSWMetaRefresh.h"
+#include "GSWPageRestorationErrorPage.h"
+#include "GSWRedirect.h"
+#include "GSWSessionCreationErrorPage.h"
+#include "GSWSessionRestorationErrorPage.h"
+#include "GSWStatsPage.h"
+
+#endif //_GSWExtensions_h__
--- a/GSWExtensions.framework/GSWIFrame.m
+++ b/GSWExtensions.framework/GSWIFrame.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWIFrame.h"

 //===================================================================================
--- a/GSWExtensions.framework/GSWLongResponsePage.m
+++ b/GSWExtensions.framework/GSWLongResponsePage.m
@ -32,8 +32,8 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
-#include <GSWExtensions/GSWLongResponsePage.h>
+#include "GSWExtWOCompatibility.h"
+#include "GSWLongResponsePage.h"

@interface GSWLongResponsePage (Private)
 -(void) _setCancelled:(BOOL)cancelled;
--- a/GSWExtensions.framework/GSWMetaRefresh.m
+++ b/GSWExtensions.framework/GSWMetaRefresh.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWMetaRefresh.h"

 //===================================================================================
--- a/GSWExtensions.framework/GSWPageRestorationErrorPage.m
+++ b/GSWExtensions.framework/GSWPageRestorationErrorPage.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWPageRestorationErrorPage.h"

 //===================================================================================
--- a/GSWExtensions.framework/GSWRedirect.m
+++ b/GSWExtensions.framework/GSWRedirect.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWRedirect.h"

 //===================================================================================
--- a/GSWExtensions.framework/GSWSessionCreationErrorPage.m
+++ b/GSWExtensions.framework/GSWSessionCreationErrorPage.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWSessionCreationErrorPage.h"

 //===================================================================================
--- a/GSWExtensions.framework/GSWSessionRestorationErrorPage.m
+++ b/GSWExtensions.framework/GSWSessionRestorationErrorPage.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWSessionRestorationErrorPage.h"

 //====================================================================
--- a/GSWExtensions.framework/GSWStatsPage.m
+++ b/GSWExtensions.framework/GSWStatsPage.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtWOCompatibility.h"
 #include "GSWStatsPage.h"

 //===================================================================================
--- a/GSWExtensions.framework/Makefile.postamble
+++ b/GSWExtensions.framework/Makefile.postamble
@ -1,4 +1,5 @@
-#  Makefile.postamble
+#   -*-makefile-*-
+#   Makefile.postamble
 #   Copyright (C) 1999 Free Software Foundation, Inc.
 #   
 #   Written by:	Manuel Guesdon <mguesdon@sbuilders.com>
@ -40,7 +41,7 @@
 # before-install::

 # Things to do after installing
-# after-install::
+after-install:: install-WO-headers

 # Things to do before uninstalling
 # before-uninstall::
@ -83,3 +84,17 @@ gsdocs:
 regenerate:

 copy-dist: $(DIST_FILES)
+
+ifneq ($(gswnames),gsw)
+install-WO-headers : 
+	$(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR);
+	$(EC)$(INSTALL_DATA) ./WOExtensions.h \
+	    $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR)/WOExtensions.h; \
+	cd $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR); \
+	pwd;\
+	for file in $(WO_HEADER_FILES) ; do \
+	  $(LN_S) -f WOExtensions.h $$file; \
+	done;$(ECHO_END)
+else
+install-WO-headers: ;
+endif
--- a/GSWExtensions.framework/Makefile.preamble
+++ b/GSWExtensions.framework/Makefile.preamble
@ -1,3 +1,4 @@
+#   -*-makefile-*-
 #   Copyright (C) 1999-2002 Free Software Foundation, Inc.
 #   
 #   Written by:	Manuel Guesdon <mguesdon@orange-concept.com>
@ -61,11 +62,9 @@ ADDITIONAL_CFLAGS =
 ADDITIONAL_INCLUDE_DIRS =  -I$(GNUSTEP_SYSTEM_ROOT)/db -I../.. -I../GSWeb.framework/derived_src

 # Additional LDFLAGS to pass to the linker
-ifeq ($(debug), yes)
-	ADDITIONAL_LDFLAGS = -lGSWeb_d -lGSANTLR_d
-else
-	ADDITIONAL_LDFLAGS = -lGSWeb -lGSANTLR 
-endif
+ADDITIONAL_LDFLAGS = -lGSANTLR 
+GSWExtensions_ADDITIONAL_LDFLAGS = GSWeb
+GSWExtensions_wo_ADDITIONAL_LDFLAGS = GSWeb_wo

 #-lgnustep-xraw

--- a/GSWExtensions.framework/WOExtensions.h
+++ b/GSWExtensions.framework/WOExtensions.h
@ -0,0 +1,41 @@
+/** WebObjects.h - <title>GSWeb: Compatibility Header - WebObjects</title>
+
+   Copyright (C) 2002 Free Software Foundation, Inc.
+   
+   Written by:	David Ayers <d.ayers@inode.at>
+
+   Date:        Nov 2002
+   
+   $Revision$
+   $Date$
+
+   This file is part of the GNUstep Web Library.
+   
+   <license>
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   </license>
+**/
+
+// $Id$
+
+#ifndef _WOExtensions_h__
+	#define _WOExtensions_h__
+
+#define  GSWEB_WONAMES
+
+#include "GSWExtensions.h"
+
+#endif
+
--- a/GSWExtensionsGSW.framework/GNUmakefile
+++ b/GSWExtensionsGSW.framework/GNUmakefile
@ -33,11 +33,30 @@ include ../config.mak
 srcdir = .

 # The framework to be compiled
+
+# Options
+ifeq ($(gswnames), gsw)
 FRAMEWORK_NAME = GSWExtensionsGSW
+endif
+ifeq ($(gswnames), wo)
+FRAMEWORK_NAME = GSWExtensionsGSW_wo
+endif
+ifeq ($(gswnames), all)
+FRAMEWORK_NAME = GSWExtensionsGSW GSWExtensionsGSW_wo
+endif
+
+# Ensure that each framework uses its own GNUSTEP_OBJ_DIR & DERIVED_SRC
+ifneq ($(GNUSTEP_INSTANCE),)
+GNUSTEP_OBJ_DIR := $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)
+DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE)
+endif
+
+GSWExtensionsGSW_wo_CPPFLAGS = -DGSWEB_WONAMES

 # The framework resource files and directories
 GSWExtensionsGSW_RESOURCE_FILES = \
-Resources/Info-gnustep.plist \
+Resources/Info-gnustep.plist
+GSWExtensionsGSW_wo_RESOURCE_FILES = $(GSWExtensionsGSW_RESOURCE_FILES)

 GSWExtensionsGSW_COMPONENTS= \
 GSWTabComponent.gswc \
@ -46,24 +65,17 @@ GSWLogin.gswc \
 GSWSimpleFormComponent.gswc \
 GSWFileUploadFormComponent.gswc \
 GSWFileUploadComponent.gswc
+GSWExtensionsGSW_wo_COMPONENTS = $(GSWExtensionsGSW_COMPONENTS)

 GSWExtensionsGSW_LANGUAGES= \
 French
+GSWExtensionsGSW_wo_LANGUAGES = $(GSWExtensionsGSW_LANGUAGES)

 GSWExtensionsGSW_RESOURCE_DIRS = 
+GSWExtensionsGSW_wo_RESOURCE_DIRS = $(GSWExtensionsGSW_RESOURCE_DIRS)

 GSWExtensionsGSW_WEBSERVER_RESOURCE_FILES = 
-
-# Determine the bundle directory extension
-#ifeq ($(profile), yes)
-#  GSWBUNDLE_EXTENSION = .frameworkp
-#else
-#  ifeq ($(debug), yes)
-#    GSWBUNDLE_EXTENSION = .frameworkd
-#  else
-#    GSWBUNDLE_EXTENSION = .framework
-#  endif
-#endif
+GSWExtensionsGSW_wo_WEBSERVER_RESOURCE_FILES = $(GSWExtensionsGSW_WEBSERVER_RESOURCE_FILES)

 # The Objective-C source files to be compiled
 GSWExtensionsGSW_OBJC_FILES = \
@ -73,22 +85,28 @@ GSWValidationFailureComponent.m \
 GSWSimpleFormComponent.m \
 GSWFileUploadFormComponent.m \
 GSWFileUploadComponent.m 
+GSWExtensionsGSW_wo_OBJC_FILES = $(GSWExtensionsGSW_OBJC_FILES)

 # The header files to be installed
 GSWExtensionsGSW_HEADER_FILES = \
+GSWExtGSWWOCompatibility.h \
 GSWLogin.h \
 GSWTabComponent.h \
 GSWValidationFailureComponent.h \
 GSWFileUploadFormComponent.h \
-GSWFileUploadComponent.h \
+GSWFileUploadComponent.h
+GSWExtensionsGSW_wo_HEADER_FILES = $(GSWExtensionsGSW_HEADER_FILES)

+GSWExtensionsGSW_HEADER_FILES_DIR = $(HEADER_DIR)
+GSWExtensionsGSW_wo_HEADER_FILES_DIR = $(GSWExtensionsGSW_HEADER_FILES_DIR)

 SRCS = $(LIBRARY_NAME:=.m)
 HDRS = $(LIBRARY_NAME:=.h)
+
 GSWExtensionsGSW_AUTOGSDOC_HEADERS = $(GSWExtensionsGSW_HEADER_FILES)
 GSWExtensionsGSW_AUTOGSDOC_SOURCE = $(GSWExtensionsGSW_OBJC_FILES)
 DOCUMENT_NAME = GSWExtensionsGSW
-GSWExtensionsGSW_HEADER_FILES_DIR = $(HEADER_DIR)
+
 GSWExtensionsGSW_AGSDOC_FILES = gswextensionsgsw.gsdoc $(GSWExtensionsGSW_AUTOGSDOC_HEADERS) 
 #$(GSWExtensionsGSW_AUTOGSDOC_SOURCE)
 GSWExtensionsGSW_AGSDOC_FLAGS = \
@ -119,3 +137,4 @@ include $(GNUSTEP_MAKEFILES)/documentation.make
 endif

 -include Makefile.postamble
+
--- a/GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h
+++ b/GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h
@ -0,0 +1,43 @@
+/** GSWExtGSWWOCompatibility.h -  <title>GSWExtGSWWOCompatibility</title>
+
+   Copyright (C) 1999-2002 Free Software Foundation, Inc.
+   
+   Written by:	David Ayers <d.ayers@inode.at>
+   Date: 	2002/11/11
+   
+   $Revision$
+   $Date$
+   
+   <abstract></abstract>
+
+   This file is part of the GNUstep Web Library.
+
+   <license>
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   </license>
+**/
+
+// $Id$
+
+#ifndef _GSWExtGSWWOCompatibility_h__
+#define _GSWExtGSWWOCompatibility_h__
+
+#ifndef GSWEB_WONAMES
+#include <GSWeb/GSWeb.h>
+#else
+#include <WebObjects/GSWeb.h>
+#endif
+
+#endif //_GSWExtGSWWOCompatibility_h__
--- a/GSWExtensionsGSW.framework/GSWFileUploadComponent.m
+++ b/GSWExtensionsGSW.framework/GSWFileUploadComponent.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtGSWWOCompatibility.h"
 #include "GSWFileUploadComponent.h"
 //====================================================================
@implementation GSWFileUploadComponent
--- a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m
+++ b/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtGSWWOCompatibility.h"
 #include "GSWFileUploadFormComponent.h"
 //====================================================================
@implementation GSWFileUploadFormComponent
--- a/GSWExtensionsGSW.framework/GSWLogin.m
+++ b/GSWExtensionsGSW.framework/GSWLogin.m
@ -20,7 +20,7 @@
   License along with this library; if not, write to the Free
   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <GSWeb/GSWeb.h>
+#include "GSWExtGSWWOCompatibility.h"
 #include "GSWLogin.h"
 //====================================================================
@implementation GSWLogin
--- a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m
+++ b/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtGSWWOCompatibility.h"
 #include "GSWSimpleFormComponent.h"
 //====================================================================
@implementation GSWSimpleFormComponent
--- a/GSWExtensionsGSW.framework/GSWTabComponent.m
+++ b/GSWExtensionsGSW.framework/GSWTabComponent.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtGSWWOCompatibility.h"
 #include "GSWTabComponent.h"
 //====================================================================
@implementation GSWTabComponent
--- a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m
+++ b/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWExtGSWWOCompatibility.h"
 #include "GSWValidationFailureComponent.h"
 //====================================================================
@implementation GSWValidationFailureComponent
--- a/GSWExtensionsGSW.framework/Makefile.preamble
+++ b/GSWExtensionsGSW.framework/Makefile.preamble
@ -1,3 +1,4 @@
+#   -*-makefile-*-
 #   Copyright (C) 1999-2002 Free Software Foundation, Inc.
 #   
 #   Written by:	Manuel Guesdon <mguesdon@orange-concept.com>
@ -61,18 +62,15 @@ ADDITIONAL_CFLAGS =
 ADDITIONAL_INCLUDE_DIRS =  -I$(GNUSTEP_SYSTEM_ROOT)/db  -I../.. -I../GSWeb.framework/derived_src

 # Additional LDFLAGS to pass to the linker
-ifeq ($(debug), yes)
-	ADDITIONAL_LDFLAGS = -lGSWeb_d -lGSANTLR_d 
-#-lGSWExtensions_d 
-else
-	ADDITIONAL_LDFLAGS = -lGSWeb -lGSANTLR 
-#-lGSWExtensions
-endif
+ADDITIONAL_LDFLAGS = -lGSANTLR 
+GSWExtensionsGSW_ADDITIONAL_LDFLAGS = -lGSWeb
+GSWExtensionsGSW_wo_ADDITIONAL_LDFLAGS = -lGSWeb_wo

 #-lgnustep-xraw

 # Additional library directories the linker should search
-ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) -L$(GNUSTEP_SYSTEM_ROOT)/lib -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR) -L../GSWExtensions.framework/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) -L$(GNUSTEP_SYSTEM_ROOT)/lib -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR) 
+#-L../GSWExtensions.framework/$(GNUSTEP_OBJ_DIR)

 #
 # Flags dealing with installing and uninstalling
--- a/GSWeb.framework/GNUmakefile
+++ b/GSWeb.framework/GNUmakefile
@ -35,7 +35,25 @@ include ../config.mak
 srcdir = .

 # The framework to be compiled
+
+# Options
+ifeq ($(gswnames), gsw)
 FRAMEWORK_NAME = GSWeb
+endif
+ifeq ($(gswnames), wo)
+FRAMEWORK_NAME = GSWeb_wo
+endif
+ifeq ($(gswnames), all)
+FRAMEWORK_NAME = GSWeb GSWeb_wo
+endif
+
+# Ensure that each framework uses its own GNUSTEP_OBJ_DIR & DERIVED_SRC
+ifneq ($(GNUSTEP_INSTANCE),)
+GNUSTEP_OBJ_DIR := $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)
+DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE)
+endif
+
+GSWeb_wo_CPPFLAGS = -DGSWEB_WONAMES

 # DTDs to install
 srcDTDDir = DTDs
@ -54,22 +72,13 @@ GSWeb_RESOURCE_FILES = \
 Resources/MIME.plist \
 Resources/languages.plist \
 DTDs
+GSWeb_wo_RESOURCE_FILES = $(GSWeb_RESOURCE_FILES)

 GSWeb_RESOURCE_DIRS = DTDs
+GSWeb_wo_RESOURCE_DIRS = $(GSWeb_RESOURCE_DIRS)

 # The framework libraries to link against
-GSWeb_GSWBUNDLE_LIBS = 
-
-# Determine the bundle directory extension
-#ifeq ($(profile), yes)
-#  GSWBUNDLE_EXTENSION = .frameworkp
-#else
-#  ifeq ($(debug), yes)
-#    GSWBUNDLE_EXTENSION = .frameworkd
-#  else
-#    GSWBUNDLE_EXTENSION = .framework
-#  endif
-#endif
+#GSWeb_GSWBUNDLE_LIBS = 

 # The Bundle Objective-C source files to be compiled
 GSWeb_OBJC_FILES = \
@ -87,7 +96,6 @@ GSWSessionTimeOut.m \
 GSWStats.m \
 NSNonBlockingFileHandle.m \
 GSWTransactionRecord.m \
-GSWeb.m \
 GSWBundle.m \
 NSObject+IVarAccess+PerformSel.m \
 NSString+Trimming.m \
@ -180,14 +188,15 @@ GSWGeometricRegion.m \
 GSWFileUpload.m \
 GSWResourceURL.m \
 GSWProcFS.m \
-GSWWOCompatibility.m \
 stacktrace.m \
 attach.m
+GSWeb_wo_OBJC_FILES = $(GSWeb_OBJC_FILES)


 # The framework installed header files
 GSWeb_HEADER_FILES = \
 GSCache.h  \
+GSWeb.h \
 GSWActiveImage.h \
 GSWAdaptor.h \
 GSWApplet.h \
@ -285,7 +294,6 @@ GSWToggle.h \
 GSWTransactionRecord.h \
 GSWURLValuedElementData.h \
 GSWVBScript.h \
-GSWeb.h \
 NSNonBlockingFileHandle.h \
 NSObject+IVarAccess+PerformSel.h \
 NSString+HTML.h \
@ -300,27 +308,47 @@ GSWResourceURL.h \
 GSWProcFS.h \
 GSWWOCompatibility.h

-# The framework installed WO header files
-GSWeb_WO_HEADER_FILES = \
-WebObjects.h \
-WOApplication.h \
-WOComponent.h \
-WOContext.h \
-WODirectAction.h \
-WORequest.h \
-WOSession.h \

-WO_HEADERS_DSTDIR = $(GNUSTEP_HEADERS)/WebObjects
-WO_HEADERS_SRCDIR = WebObjects
+# The framework installed WO header files
+GSWeb_wo_HEADER_FILES = $(GSWeb_HEADER_FILES)
+
+WO_HEADER_FILES = \
+	WOAdaptor.h \
+	WOApplication.h \
+	WOAssociation.h \
+	WOComponent.h \
+	WOContext.h \
+	WOCookie.h \
+	WODirectAction.h \
+	WODisplayGroup.h \
+	WODynamicElement.h \
+	WOElement.h \
+	WOMailDelivery.h \
+	WORequest.h \
+	WORequestHandler.h \
+	WOResourceManager.h \
+	WOResponse.h \
+	WOSession.h \
+	WOSessionStore.h \
+	WOStatisitcsStore.h 
+
+# WebObjects.h not needed as it gets copied explicitly
+
+
+GSWeb_HEADER_FILES_DIR = $(HEADER_DIR)
+GSWeb_wo_HEADER_FILES_DIR = $(HEADER_DIR)
+GSWeb_wo_HEADER_FILES_INSTALL_DIR = WebObjects

 SRCS = $(LIBRARY_NAME:=.m)
 HDRS = $(LIBRARY_NAME:=.h)
+
+# Documentation
+DOCUMENT_NAME = GSWeb
+
 GSWeb_AUTOGSDOC_HEADERS = $(GSWeb_HEADER_FILES)
 GSWeb_AUTOGSDOC_SOURCE = $(GSWeb_OBJC_FILES)
-DOCUMENT_NAME = GSWeb
-GSWeb_HEADER_FILES_DIR = $(HEADER_DIR)
 GSWeb_AGSDOC_FILES = gsweb.gsdoc $(GSWeb_AUTOGSDOC_HEADERS) 
-#$(GSWeb_AUTOGSDOC_SOURCE)
+
 GSWeb_AGSDOC_FLAGS = \
 	-Declared Foundation \
 	-Standards YES \
@ -334,6 +362,7 @@ GSWeb_AGSDOC_FLAGS = \
 	GS_ZONE_SCOPE=extern;GS_ZONE_ATTR="";\
 	}' -Up gsweb

+GSWeb_AGSDOC_FLAGS = $(GSWeb_AGSDOC_FLAGS)

 -include Makefile.preamble

--- a/GSWeb.framework/GSCache.m
+++ b/GSWeb.framework/GSCache.m
@ -23,7 +23,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 #include "GSCache.h"

 //========================================================================================
--- a/GSWeb.framework/GSWActionURL.m
+++ b/GSWeb.framework/GSWActionURL.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWActionURL
--- a/GSWeb.framework/GSWActiveImage.m
+++ b/GSWeb.framework/GSWActiveImage.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWActiveImage
--- a/GSWeb.framework/GSWAdaptor.m
+++ b/GSWeb.framework/GSWAdaptor.m
@ -23,7 +23,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 //====================================================================
--- a/GSWeb.framework/GSWApplet.m
+++ b/GSWeb.framework/GSWApplet.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWApplet
--- a/GSWeb.framework/GSWApplication.m
+++ b/GSWeb.framework/GSWApplication.m
@ -30,7 +30,8 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
+
 #if GDL2 // GDL2 implementation
 #include <EOAccess/EOModelGroup.h>
 #endif
@ -471,7 +472,7 @@ int GSWApplicationMainReal(NSString* applicationClassName,
      NS_ENDHANDLER;
    };
  NSDebugLog(@"result=%d",result);
-  printf("result=%d\n",result);  
+  printf("result=%d\n",result);
  if (result>=0 && GSWApp)
    {
      [GSWApp _setPool:[NSAutoreleasePool new]];
@ -626,10 +627,7 @@ int GSWApplicationMain(NSString* applicationClassName,
  if (GSWApp == self)
  {
    GSWApp = nil;
-#if !GSWEB_WONAMES
-    WOApp = nil;
-#endif
-   }
+  }

  GSWLogMemC("Dealloc GSWApplication Super");
  [super dealloc];
@ -3017,9 +3015,6 @@ selfLockn,
              [application class],
              [application name]);
  GSWApp=application;
-#if !GSWEB_WONAMES
-  WOApp=(WOApplication*)application;
-#endif
 };

@end
@ -4828,7 +4823,7 @@ selfLockn,
 	}
  else
 	{
-	  Class GSWElementClass=[GSWElement class]);
+	  Class GSWElementClass=[GSWElement class];
 	  if (!ClassIsKindOfClass(aClass,GSWElementClass))
 		{
 		  ExceptionRaise(@"GSWApplication",
--- a/GSWeb.framework/GSWAssociation.m
+++ b/GSWeb.framework/GSWAssociation.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 #include <math.h>
 #if !defined(__NetBSD__)
 #include <values.h>
--- a/GSWeb.framework/GSWBindingNameAssociation.m
+++ b/GSWeb.framework/GSWBindingNameAssociation.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWBindingNameAssociation
--- a/GSWeb.framework/GSWBody.m
+++ b/GSWeb.framework/GSWBody.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWBody
--- a/GSWeb.framework/GSWBrowser.m
+++ b/GSWeb.framework/GSWBrowser.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 /**
 Bindings
--- a/GSWeb.framework/GSWBundle.m
+++ b/GSWeb.framework/GSWBundle.m
@ -32,7 +32,7 @@

 static const char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 #ifdef GDL2
 //====================================================================
--- a/GSWeb.framework/GSWCheckBox.m
+++ b/GSWeb.framework/GSWCheckBox.m
@ -28,7 +28,7 @@
   </license>
 **/

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 /**
 Bindings
--- a/GSWeb.framework/GSWCheckBoxList.m
+++ b/GSWeb.framework/GSWCheckBoxList.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 /**
 Bindings
--- a/GSWeb.framework/GSWClientSideScript.m
+++ b/GSWeb.framework/GSWClientSideScript.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWClientSideScript
--- a/GSWeb.framework/GSWComponent.m
+++ b/GSWeb.framework/GSWComponent.m
@ -32,7 +32,7 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWComponent
--- a/GSWeb.framework/GSWComponentContent.m
+++ b/GSWeb.framework/GSWComponentContent.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWComponentContent
--- a/GSWeb.framework/GSWComponentDefinition.m
+++ b/GSWeb.framework/GSWComponentDefinition.m
@ -28,7 +28,7 @@
   </license>
 **/

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWComponentDefinition
@ -352,7 +352,7 @@ languages:(NSArray*)languages

  // Get component class
  componentClass=[self componentClass];
-  NSAssert(componentClass,@"No componentClass");
+  NSAssert1(componentClass,@"No componentClass for:%@",NSStringFromClass([self class]));
  NSDebugMLLog(@"gswcomponents",@"componentClass=%p",(void*)componentClass);

  // Put the component definition in the thread dictionary because we need it during component initialization
--- a/GSWeb.framework/GSWComponentReference.m
+++ b/GSWeb.framework/GSWComponentReference.m
@ -31,7 +31,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWComponentReference
--- a/GSWeb.framework/GSWComponentRequestHandler.m
+++ b/GSWeb.framework/GSWComponentRequestHandler.m
@ -29,7 +29,7 @@

 static const char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWComponentRequestHandler
--- a/GSWeb.framework/GSWConditional.m
+++ b/GSWeb.framework/GSWConditional.m
@ -30,7 +30,7 @@
   </license>
 **/

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 /**
 Bindings
--- a/GSWeb.framework/GSWConfig.h
+++ b/GSWeb.framework/GSWConfig.h
@ -26,10 +26,13 @@
 #ifndef _GSWebConfig_h__
 #define _GSWebConfig_h__

+#ifdef  GSWEB_WONAMES
+#import "GSWWOCompatibility.h"
+#endif
+
 #define GSLOCK_DELAY_S	360

 #define GSWEB_STRICT	0
-#define GSWEB_WONAMES	0

 #define GSWOPTVALUE_ApplicationBaseURL_WO			@"/WebObjects"
 #define GSWOPTVALUE_ApplicationBaseURL_GSWEB			@"/GSWeb"
--- a/GSWeb.framework/GSWConstantValueAssociation.m
+++ b/GSWeb.framework/GSWConstantValueAssociation.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWConstantValueAssociation
--- a/GSWeb.framework/GSWConstants.m
+++ b/GSWeb.framework/GSWConstants.m
@ -32,7 +32,7 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
 // -
--- a/GSWeb.framework/GSWContext.m
+++ b/GSWeb.framework/GSWContext.m
@ -30,7 +30,7 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 static int dontTraceComponentActionURL=0;
 //====================================================================
--- a/GSWeb.framework/GSWCookie.m
+++ b/GSWeb.framework/GSWCookie.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWCookie
--- a/GSWeb.framework/GSWDebug.m
+++ b/GSWeb.framework/GSWDebug.m
@ -29,8 +29,8 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
-#include <GSWeb/GSWDebug.h>
+#include "GSWeb.h"
+#include "GSWDebug.h"
 #include <Foundation/NSThread.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <unistd.h>
--- a/GSWeb.framework/GSWDefaultAdaptor.m
+++ b/GSWeb.framework/GSWDefaultAdaptor.m
@ -30,7 +30,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 //#include <gnustep/base/UnixFileHandle.h>
 #include <gnustep/base/GSFileHandle.h>
 #include "config.h"
--- a/GSWeb.framework/GSWDefaultAdaptorThread.m
+++ b/GSWeb.framework/GSWDefaultAdaptorThread.m
@ -31,7 +31,7 @@

 static const char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 #include <unistd.h>
 #include <math.h> //for fabs
 #include "NSNonBlockingFileHandle.h"
--- a/GSWeb.framework/GSWDeployedBundle.m
+++ b/GSWeb.framework/GSWDeployedBundle.m
@ -31,7 +31,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 //#include <pthread.h>

 //====================================================================
--- a/GSWeb.framework/GSWDirectAction.m
+++ b/GSWeb.framework/GSWDirectAction.m
@ -30,7 +30,7 @@

 static const char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWDirectAction
--- a/GSWeb.framework/GSWDirectActionRequestHandler.m
+++ b/GSWeb.framework/GSWDirectActionRequestHandler.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWDirectActionRequestHandler
--- a/GSWeb.framework/GSWDisplayGroup.h
+++ b/GSWeb.framework/GSWDisplayGroup.h
@ -64,9 +64,11 @@
   #endif
 #else
   #import <EOControl/EOQualifier.h>
+   #import <EOControl/EOEditingContext.h>
   #import <EOControl/EODataSource.h>
   #import <EOControl/EODetailDataSource.h>
   #import <EOControl/EOKeyValueArchiver.h>
+   #import <EOControl/EONull.h>
   #import <EOAccess/EODatabaseDataSource.h>
 #endif

--- a/GSWeb.framework/GSWDisplayGroup.m
+++ b/GSWeb.framework/GSWDisplayGroup.m
@ -29,7 +29,7 @@
   </license>
 **/

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
@class EOUndoManager;

 //====================================================================
--- a/GSWeb.framework/GSWDynamicElement.m
+++ b/GSWeb.framework/GSWDynamicElement.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 //====================================================================
--- a/GSWeb.framework/GSWDynamicURLString.m
+++ b/GSWeb.framework/GSWDynamicURLString.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWDynamicURLString
--- a/GSWeb.framework/GSWElement.m
+++ b/GSWeb.framework/GSWElement.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 BYTE ElementsMap_htmlBareString	=	(BYTE)0x53;
 BYTE ElementsMap_gswebElement	=	(BYTE)0x57;
--- a/GSWeb.framework/GSWElementIDString.m
+++ b/GSWeb.framework/GSWElementIDString.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 //====================================================================
--- a/GSWeb.framework/GSWEmbeddedObject.m
+++ b/GSWeb.framework/GSWEmbeddedObject.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWEmbeddedObject
--- a/GSWeb.framework/GSWFileUpload.m
+++ b/GSWeb.framework/GSWFileUpload.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWFileUpload
--- a/GSWeb.framework/GSWForm.m
+++ b/GSWeb.framework/GSWForm.m
@ -29,7 +29,7 @@

 static const char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWForm
--- a/GSWeb.framework/GSWFrame.m
+++ b/GSWeb.framework/GSWFrame.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWFrame
--- a/GSWeb.framework/GSWGenericContainer.m
+++ b/GSWeb.framework/GSWGenericContainer.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWGenericContainer
--- a/GSWeb.framework/GSWGenericElement.m
+++ b/GSWeb.framework/GSWGenericElement.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWGenericElement
--- a/GSWeb.framework/GSWGeometricRegion.m
+++ b/GSWeb.framework/GSWGeometricRegion.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 #include <math.h>


--- a/GSWeb.framework/GSWHTMLAttrLexer.h
+++ b/GSWeb.framework/GSWHTMLAttrLexer.h
@ -11,7 +11,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 #include "gsantlr/ANTLRCommon.h"
--- a/GSWeb.framework/GSWHTMLAttrLexer.m
+++ b/GSWeb.framework/GSWHTMLAttrLexer.m
@ -8,7 +8,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 #include "gsantlr/ANTLRCommon.h"
--- a/GSWeb.framework/GSWHTMLAttrParser.h
+++ b/GSWeb.framework/GSWHTMLAttrParser.h
@ -11,7 +11,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 #include "gsantlr/ANTLRCommon.h"
 #include "gsantlr/ANTLRTokenizer.h"
--- a/GSWeb.framework/GSWHTMLAttrParser.m
+++ b/GSWeb.framework/GSWHTMLAttrParser.m
@ -8,7 +8,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 #include "gsantlr/ANTLRCommon.h"
--- a/GSWeb.framework/GSWHTMLAttrParserExt.m
+++ b/GSWeb.framework/GSWHTMLAttrParserExt.m
@ -28,7 +28,7 @@
   </license>
 **/

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 #include "GSWHTMLAttrParser.h"

 //====================================================================
--- a/GSWeb.framework/GSWHTMLAttrTokenTypes.h
+++ b/GSWeb.framework/GSWHTMLAttrTokenTypes.h
@ -11,7 +11,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 enum GSWHTMLAttrTokenTypes {
 	GSWHTMLAttrTokenType_EOF_ = 1,
--- a/GSWeb.framework/GSWHTMLBareString.m
+++ b/GSWeb.framework/GSWHTMLBareString.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHTMLBareString
--- a/GSWeb.framework/GSWHTMLComment.m
+++ b/GSWeb.framework/GSWHTMLComment.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHTMLComment
--- a/GSWeb.framework/GSWHTMLDynamicElement.m
+++ b/GSWeb.framework/GSWHTMLDynamicElement.m
@ -32,7 +32,7 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHTMLDynamicElement
@ -55,7 +55,6 @@ static const char rcsId[]="$Id$";
  return self;
 };

-
 //--------------------------------------------------------------------
 -(id)initWithName:(NSString*)elementName
 attributeAssociations:(NSDictionary*)attributeAssociations
--- a/GSWeb.framework/GSWHTMLLexer.h
+++ b/GSWeb.framework/GSWHTMLLexer.h
@ -11,7 +11,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 #include "gsantlr/ANTLRCommon.h"
--- a/GSWeb.framework/GSWHTMLLexer.m
+++ b/GSWeb.framework/GSWHTMLLexer.m
@ -8,7 +8,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 #include "gsantlr/ANTLRCommon.h"
--- a/GSWeb.framework/GSWHTMLParser.h
+++ b/GSWeb.framework/GSWHTMLParser.h
@ -11,7 +11,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 #include "gsantlr/ANTLRCommon.h"
 #include "gsantlr/ANTLRTokenizer.h"
--- a/GSWeb.framework/GSWHTMLParser.m
+++ b/GSWeb.framework/GSWHTMLParser.m
@ -8,7 +8,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"


 #include "gsantlr/ANTLRCommon.h"
--- a/GSWeb.framework/GSWHTMLParserExt.m
+++ b/GSWeb.framework/GSWHTMLParserExt.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHTMLParser (GSWHTMLParserExt)
--- a/GSWeb.framework/GSWHTMLStaticElement.m
+++ b/GSWeb.framework/GSWHTMLStaticElement.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHTMLStaticElement
--- a/GSWeb.framework/GSWHTMLStaticGroup.m
+++ b/GSWeb.framework/GSWHTMLStaticGroup.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHTMLStaticGroup
--- a/GSWeb.framework/GSWHTMLTokenTypes.h
+++ b/GSWeb.framework/GSWHTMLTokenTypes.h
@ -11,7 +11,7 @@
 */


-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 enum GSWHTMLTokenTypes {
 	GSWHTMLTokenType_EOF_ = 1,
--- a/GSWeb.framework/GSWHTMLURLValuedElement.m
+++ b/GSWeb.framework/GSWHTMLURLValuedElement.m
@ -30,7 +30,7 @@

 static const char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
 #include <gscrypt/GSMD5.h>

 //====================================================================
--- a/GSWeb.framework/GSWHiddenField.m
+++ b/GSWeb.framework/GSWHiddenField.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHiddenField
--- a/GSWeb.framework/GSWHyperlink.m
+++ b/GSWeb.framework/GSWHyperlink.m
@ -30,7 +30,7 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWHyperlink
--- a/GSWeb.framework/GSWImage.m
+++ b/GSWeb.framework/GSWImage.m
@ -30,7 +30,7 @@

 static const char rcsId[]="$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWImage
--- a/GSWeb.framework/GSWImageButton.m
+++ b/GSWeb.framework/GSWImageButton.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWImageButton
--- a/GSWeb.framework/GSWInput.m
+++ b/GSWeb.framework/GSWInput.m
@ -28,7 +28,7 @@
   </license>
 **/

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWInput
--- a/GSWeb.framework/GSWJavaScript.m
+++ b/GSWeb.framework/GSWJavaScript.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWJavaScript
--- a/GSWeb.framework/GSWKeyValueAssociation.m
+++ b/GSWeb.framework/GSWKeyValueAssociation.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWKeyValueAssociation
--- a/GSWeb.framework/GSWMailDelivery.m
+++ b/GSWeb.framework/GSWMailDelivery.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWMailDelivery
--- a/GSWeb.framework/GSWMultiKeyDictionary.m
+++ b/GSWeb.framework/GSWMultiKeyDictionary.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 #define DEFAULT_DICTIONARY_CAPACITY 32

--- a/GSWeb.framework/GSWNestedList.m
+++ b/GSWeb.framework/GSWNestedList.m
@ -29,7 +29,7 @@

 static char rcsId[] = "$Id$";

-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"

 //====================================================================
@implementation GSWNestedList
--- a/Show more
+++ b/Show more