diff --git a/ChangeLog b/ChangeLog index 8ff5ccf..2f1dcb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-13 David Wetzel + rename all *.framework top level directories to their basename. + * GSWDatabase/WODisplayGroup.m + remove local NSAutoreleasePool + adjust makefiles + 2010-06-13 David Wetzel * Examples/hello/Main.m add DirectAction to avoid error messages diff --git a/GNUmakefile b/GNUmakefile index 3ff26ec..627aea4 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -30,9 +30,9 @@ include ./config.mak # # The list of subproject directories # -SUBPROJECTS = GSWeb.framework \ - GSWExtensions.framework \ - GSWExtensionsGSW.framework \ +SUBPROJECTS = GSWeb \ + GSWExtensions \ + GSWExtensionsGSW \ GSWDatabase #GSWAdaptors diff --git a/GSWDatabase/WODisplayGroup.m b/GSWDatabase/WODisplayGroup.m index 2aa17ba..259bcc2 100644 --- a/GSWDatabase/WODisplayGroup.m +++ b/GSWDatabase/WODisplayGroup.m @@ -1110,7 +1110,6 @@ shouldRedisplayForEditingContextChangeNotification:notification]; { EOUndoManager* undoManager=nil; NSArray *objects=nil; - NSAutoreleasePool* arp = nil; [[NSNotificationCenter defaultCenter] postNotificationName:@"WODisplayGroupWillFetch" //TODO Name @@ -1125,7 +1124,6 @@ shouldRedisplayForEditingContextChangeNotification:notification]; [_dataSource setQualifierBindings:_queryBindings]; } - arp = [NSAutoreleasePool new]; NS_DURING { objects = [_dataSource fetchObjects]; @@ -1136,12 +1134,10 @@ shouldRedisplayForEditingContextChangeNotification:notification]; { NSLog(@"%@ (%@)",localException,[localException reason]); RETAIN(localException); - DESTROY(arp); AUTORELEASE(localException); [localException raise]; } NS_ENDHANDLER; - DESTROY(arp); if (_delegateRespondsTo.didFetchObjects) [_delegate displayGroup:self diff --git a/GSWExtensions.framework/.cvsignore b/GSWExtensions/.cvsignore similarity index 100% rename from GSWExtensions.framework/.cvsignore rename to GSWExtensions/.cvsignore diff --git a/GSWExtensions.framework/French.lproj/.cvsignore b/GSWExtensions/French.lproj/.cvsignore similarity index 100% rename from GSWExtensions.framework/French.lproj/.cvsignore rename to GSWExtensions/French.lproj/.cvsignore diff --git a/GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.gswd b/GSWExtensions/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.gswd similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.gswd rename to GSWExtensions/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.gswd diff --git a/GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html b/GSWExtensions/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html rename to GSWExtensions/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html diff --git a/GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd b/GSWExtensions/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd rename to GSWExtensions/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd diff --git a/GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html b/GSWExtensions/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html rename to GSWExtensions/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html diff --git a/GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd b/GSWExtensions/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd rename to GSWExtensions/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd diff --git a/GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi b/GSWExtensions/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi rename to GSWExtensions/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi diff --git a/GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html b/GSWExtensions/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html rename to GSWExtensions/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html diff --git a/GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd b/GSWExtensions/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd rename to GSWExtensions/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd diff --git a/GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi b/GSWExtensions/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi rename to GSWExtensions/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi diff --git a/GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html b/GSWExtensions/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html similarity index 100% rename from GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html rename to GSWExtensions/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html diff --git a/GSWExtensions.framework/GNUmakefile b/GSWExtensions/GNUmakefile similarity index 100% rename from GSWExtensions.framework/GNUmakefile rename to GSWExtensions/GNUmakefile diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.api b/GSWExtensions/GSWCollapsibleComponentContent.api similarity index 100% rename from GSWExtensions.framework/GSWCollapsibleComponentContent.api rename to GSWExtensions/GSWCollapsibleComponentContent.api diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd b/GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd similarity index 100% rename from GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd rename to GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi b/GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi similarity index 100% rename from GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi rename to GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html b/GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html similarity index 100% rename from GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html rename to GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/WOCollapsibleComponentContent.woo b/GSWExtensions/GSWCollapsibleComponentContent.gswc/WOCollapsibleComponentContent.woo similarity index 100% rename from GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/WOCollapsibleComponentContent.woo rename to GSWExtensions/GSWCollapsibleComponentContent.gswc/WOCollapsibleComponentContent.woo diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.h b/GSWExtensions/GSWCollapsibleComponentContent.h similarity index 100% rename from GSWExtensions.framework/GSWCollapsibleComponentContent.h rename to GSWExtensions/GSWCollapsibleComponentContent.h diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.m b/GSWExtensions/GSWCollapsibleComponentContent.m similarity index 100% rename from GSWExtensions.framework/GSWCollapsibleComponentContent.m rename to GSWExtensions/GSWCollapsibleComponentContent.m diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.api b/GSWExtensions/GSWDictionaryRepetition.api similarity index 100% rename from GSWExtensions.framework/GSWDictionaryRepetition.api rename to GSWExtensions/GSWDictionaryRepetition.api diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswd b/GSWExtensions/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswd similarity index 100% rename from GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswd rename to GSWExtensions/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswd diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi b/GSWExtensions/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi similarity index 100% rename from GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi rename to GSWExtensions/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.html b/GSWExtensions/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.html similarity index 100% rename from GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.html rename to GSWExtensions/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.html diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.gswc/WODictionaryRepetition.woo b/GSWExtensions/GSWDictionaryRepetition.gswc/WODictionaryRepetition.woo similarity index 100% rename from GSWExtensions.framework/GSWDictionaryRepetition.gswc/WODictionaryRepetition.woo rename to GSWExtensions/GSWDictionaryRepetition.gswc/WODictionaryRepetition.woo diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.h b/GSWExtensions/GSWDictionaryRepetition.h similarity index 100% rename from GSWExtensions.framework/GSWDictionaryRepetition.h rename to GSWExtensions/GSWDictionaryRepetition.h diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.m b/GSWExtensions/GSWDictionaryRepetition.m similarity index 100% rename from GSWExtensions.framework/GSWDictionaryRepetition.m rename to GSWExtensions/GSWDictionaryRepetition.m diff --git a/GSWExtensions.framework/GSWExceptionPage.api b/GSWExtensions/GSWExceptionPage.api similarity index 100% rename from GSWExtensions.framework/GSWExceptionPage.api rename to GSWExtensions/GSWExceptionPage.api diff --git a/GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd b/GSWExtensions/GSWExceptionPage.gswc/GSWExceptionPage.gswd similarity index 100% rename from GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd rename to GSWExtensions/GSWExceptionPage.gswc/GSWExceptionPage.gswd diff --git a/GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html b/GSWExtensions/GSWExceptionPage.gswc/GSWExceptionPage.html similarity index 100% rename from GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html rename to GSWExtensions/GSWExceptionPage.gswc/GSWExceptionPage.html diff --git a/GSWExtensions.framework/GSWExceptionPage.h b/GSWExtensions/GSWExceptionPage.h similarity index 100% rename from GSWExtensions.framework/GSWExceptionPage.h rename to GSWExtensions/GSWExceptionPage.h diff --git a/GSWExtensions.framework/GSWExceptionPage.m b/GSWExtensions/GSWExceptionPage.m similarity index 100% rename from GSWExtensions.framework/GSWExceptionPage.m rename to GSWExtensions/GSWExceptionPage.m diff --git a/GSWExtensions.framework/GSWExtWOCompatibility.h b/GSWExtensions/GSWExtWOCompatibility.h similarity index 100% rename from GSWExtensions.framework/GSWExtWOCompatibility.h rename to GSWExtensions/GSWExtWOCompatibility.h diff --git a/GSWExtensions.framework/GSWExtensions.h b/GSWExtensions/GSWExtensions.h similarity index 100% rename from GSWExtensions.framework/GSWExtensions.h rename to GSWExtensions/GSWExtensions.h diff --git a/GSWExtensions.framework/GSWIFrame.api b/GSWExtensions/GSWIFrame.api similarity index 100% rename from GSWExtensions.framework/GSWIFrame.api rename to GSWExtensions/GSWIFrame.api diff --git a/GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.gswd b/GSWExtensions/GSWIFrame.gswc/GSWIFrame.gswd similarity index 100% rename from GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.gswd rename to GSWExtensions/GSWIFrame.gswc/GSWIFrame.gswd diff --git a/GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.gswi b/GSWExtensions/GSWIFrame.gswc/GSWIFrame.gswi similarity index 100% rename from GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.gswi rename to GSWExtensions/GSWIFrame.gswc/GSWIFrame.gswi diff --git a/GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.html b/GSWExtensions/GSWIFrame.gswc/GSWIFrame.html similarity index 100% rename from GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.html rename to GSWExtensions/GSWIFrame.gswc/GSWIFrame.html diff --git a/GSWExtensions.framework/GSWIFrame.h b/GSWExtensions/GSWIFrame.h similarity index 100% rename from GSWExtensions.framework/GSWIFrame.h rename to GSWExtensions/GSWIFrame.h diff --git a/GSWExtensions.framework/GSWIFrame.m b/GSWExtensions/GSWIFrame.m similarity index 100% rename from GSWExtensions.framework/GSWIFrame.m rename to GSWExtensions/GSWIFrame.m diff --git a/GSWExtensions.framework/GSWKeyValueConditional.api b/GSWExtensions/GSWKeyValueConditional.api similarity index 100% rename from GSWExtensions.framework/GSWKeyValueConditional.api rename to GSWExtensions/GSWKeyValueConditional.api diff --git a/GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd b/GSWExtensions/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd similarity index 100% rename from GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd rename to GSWExtensions/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd diff --git a/GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi b/GSWExtensions/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi similarity index 100% rename from GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi rename to GSWExtensions/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi diff --git a/GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.html b/GSWExtensions/GSWKeyValueConditional.gswc/GSWKeyValueConditional.html similarity index 100% rename from GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.html rename to GSWExtensions/GSWKeyValueConditional.gswc/GSWKeyValueConditional.html diff --git a/GSWExtensions.framework/GSWKeyValueConditional.h b/GSWExtensions/GSWKeyValueConditional.h similarity index 100% rename from GSWExtensions.framework/GSWKeyValueConditional.h rename to GSWExtensions/GSWKeyValueConditional.h diff --git a/GSWExtensions.framework/GSWKeyValueConditional.m b/GSWExtensions/GSWKeyValueConditional.m similarity index 100% rename from GSWExtensions.framework/GSWKeyValueConditional.m rename to GSWExtensions/GSWKeyValueConditional.m diff --git a/GSWExtensions.framework/GSWLongResponsePage.h b/GSWExtensions/GSWLongResponsePage.h similarity index 100% rename from GSWExtensions.framework/GSWLongResponsePage.h rename to GSWExtensions/GSWLongResponsePage.h diff --git a/GSWExtensions.framework/GSWLongResponsePage.m b/GSWExtensions/GSWLongResponsePage.m similarity index 100% rename from GSWExtensions.framework/GSWLongResponsePage.m rename to GSWExtensions/GSWLongResponsePage.m diff --git a/GSWExtensions.framework/GSWMetaRefresh.api b/GSWExtensions/GSWMetaRefresh.api similarity index 100% rename from GSWExtensions.framework/GSWMetaRefresh.api rename to GSWExtensions/GSWMetaRefresh.api diff --git a/GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.gswd b/GSWExtensions/GSWMetaRefresh.gswc/GSWMetaRefresh.gswd similarity index 100% rename from GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.gswd rename to GSWExtensions/GSWMetaRefresh.gswc/GSWMetaRefresh.gswd diff --git a/GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.gswi b/GSWExtensions/GSWMetaRefresh.gswc/GSWMetaRefresh.gswi similarity index 100% rename from GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.gswi rename to GSWExtensions/GSWMetaRefresh.gswc/GSWMetaRefresh.gswi diff --git a/GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.html b/GSWExtensions/GSWMetaRefresh.gswc/GSWMetaRefresh.html similarity index 100% rename from GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.html rename to GSWExtensions/GSWMetaRefresh.gswc/GSWMetaRefresh.html diff --git a/GSWExtensions.framework/GSWMetaRefresh.h b/GSWExtensions/GSWMetaRefresh.h similarity index 100% rename from GSWExtensions.framework/GSWMetaRefresh.h rename to GSWExtensions/GSWMetaRefresh.h diff --git a/GSWExtensions.framework/GSWMetaRefresh.m b/GSWExtensions/GSWMetaRefresh.m similarity index 100% rename from GSWExtensions.framework/GSWMetaRefresh.m rename to GSWExtensions/GSWMetaRefresh.m diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.api b/GSWExtensions/GSWPageRestorationErrorPage.api similarity index 100% rename from GSWExtensions.framework/GSWPageRestorationErrorPage.api rename to GSWExtensions/GSWPageRestorationErrorPage.api diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd b/GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd similarity index 100% rename from GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd rename to GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi b/GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi similarity index 100% rename from GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi rename to GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html b/GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html similarity index 100% rename from GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html rename to GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.h b/GSWExtensions/GSWPageRestorationErrorPage.h similarity index 100% rename from GSWExtensions.framework/GSWPageRestorationErrorPage.h rename to GSWExtensions/GSWPageRestorationErrorPage.h diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.m b/GSWExtensions/GSWPageRestorationErrorPage.m similarity index 100% rename from GSWExtensions.framework/GSWPageRestorationErrorPage.m rename to GSWExtensions/GSWPageRestorationErrorPage.m diff --git a/GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.gswd b/GSWExtensions/GSWRedirect.gswc/GSWRedirect.gswd similarity index 100% rename from GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.gswd rename to GSWExtensions/GSWRedirect.gswc/GSWRedirect.gswd diff --git a/GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.gswi b/GSWExtensions/GSWRedirect.gswc/GSWRedirect.gswi similarity index 100% rename from GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.gswi rename to GSWExtensions/GSWRedirect.gswc/GSWRedirect.gswi diff --git a/GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.html b/GSWExtensions/GSWRedirect.gswc/GSWRedirect.html similarity index 100% rename from GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.html rename to GSWExtensions/GSWRedirect.gswc/GSWRedirect.html diff --git a/GSWExtensions.framework/GSWRedirect.h b/GSWExtensions/GSWRedirect.h similarity index 100% rename from GSWExtensions.framework/GSWRedirect.h rename to GSWExtensions/GSWRedirect.h diff --git a/GSWExtensions.framework/GSWRedirect.m b/GSWExtensions/GSWRedirect.m similarity index 100% rename from GSWExtensions.framework/GSWRedirect.m rename to GSWExtensions/GSWRedirect.m diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.api b/GSWExtensions/GSWSessionCreationErrorPage.api similarity index 100% rename from GSWExtensions.framework/GSWSessionCreationErrorPage.api rename to GSWExtensions/GSWSessionCreationErrorPage.api diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd b/GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd similarity index 100% rename from GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd rename to GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi b/GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi similarity index 100% rename from GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi rename to GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html b/GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html similarity index 100% rename from GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html rename to GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.h b/GSWExtensions/GSWSessionCreationErrorPage.h similarity index 100% rename from GSWExtensions.framework/GSWSessionCreationErrorPage.h rename to GSWExtensions/GSWSessionCreationErrorPage.h diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.m b/GSWExtensions/GSWSessionCreationErrorPage.m similarity index 100% rename from GSWExtensions.framework/GSWSessionCreationErrorPage.m rename to GSWExtensions/GSWSessionCreationErrorPage.m diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.api b/GSWExtensions/GSWSessionRestorationErrorPage.api similarity index 100% rename from GSWExtensions.framework/GSWSessionRestorationErrorPage.api rename to GSWExtensions/GSWSessionRestorationErrorPage.api diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd b/GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd similarity index 100% rename from GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd rename to GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi b/GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi similarity index 100% rename from GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi rename to GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html b/GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html similarity index 100% rename from GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html rename to GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.h b/GSWExtensions/GSWSessionRestorationErrorPage.h similarity index 100% rename from GSWExtensions.framework/GSWSessionRestorationErrorPage.h rename to GSWExtensions/GSWSessionRestorationErrorPage.h diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.m b/GSWExtensions/GSWSessionRestorationErrorPage.m similarity index 100% rename from GSWExtensions.framework/GSWSessionRestorationErrorPage.m rename to GSWExtensions/GSWSessionRestorationErrorPage.m diff --git a/GSWExtensions.framework/GSWStatsPage.api b/GSWExtensions/GSWStatsPage.api similarity index 100% rename from GSWExtensions.framework/GSWStatsPage.api rename to GSWExtensions/GSWStatsPage.api diff --git a/GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswd b/GSWExtensions/GSWStatsPage.gswc/GSWStatsPage.gswd similarity index 100% rename from GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswd rename to GSWExtensions/GSWStatsPage.gswc/GSWStatsPage.gswd diff --git a/GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswi b/GSWExtensions/GSWStatsPage.gswc/GSWStatsPage.gswi similarity index 100% rename from GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswi rename to GSWExtensions/GSWStatsPage.gswc/GSWStatsPage.gswi diff --git a/GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.html b/GSWExtensions/GSWStatsPage.gswc/GSWStatsPage.html similarity index 100% rename from GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.html rename to GSWExtensions/GSWStatsPage.gswc/GSWStatsPage.html diff --git a/GSWExtensions.framework/GSWStatsPage.h b/GSWExtensions/GSWStatsPage.h similarity index 100% rename from GSWExtensions.framework/GSWStatsPage.h rename to GSWExtensions/GSWStatsPage.h diff --git a/GSWExtensions.framework/GSWStatsPage.m b/GSWExtensions/GSWStatsPage.m similarity index 100% rename from GSWExtensions.framework/GSWStatsPage.m rename to GSWExtensions/GSWStatsPage.m diff --git a/GSWExtensions.framework/GSWTable.api b/GSWExtensions/GSWTable.api similarity index 100% rename from GSWExtensions.framework/GSWTable.api rename to GSWExtensions/GSWTable.api diff --git a/GSWExtensions.framework/GSWTable.gswc/GSWTable.gswd b/GSWExtensions/GSWTable.gswc/GSWTable.gswd similarity index 100% rename from GSWExtensions.framework/GSWTable.gswc/GSWTable.gswd rename to GSWExtensions/GSWTable.gswc/GSWTable.gswd diff --git a/GSWExtensions.framework/GSWTable.gswc/GSWTable.gswi b/GSWExtensions/GSWTable.gswc/GSWTable.gswi similarity index 100% rename from GSWExtensions.framework/GSWTable.gswc/GSWTable.gswi rename to GSWExtensions/GSWTable.gswc/GSWTable.gswi diff --git a/GSWExtensions.framework/GSWTable.gswc/GSWTable.html b/GSWExtensions/GSWTable.gswc/GSWTable.html similarity index 100% rename from GSWExtensions.framework/GSWTable.gswc/GSWTable.html rename to GSWExtensions/GSWTable.gswc/GSWTable.html diff --git a/GSWExtensions.framework/GSWTableString.api b/GSWExtensions/GSWTableString.api similarity index 100% rename from GSWExtensions.framework/GSWTableString.api rename to GSWExtensions/GSWTableString.api diff --git a/GSWExtensions.framework/GSWTableString.gswc/GSWTableString.gswd b/GSWExtensions/GSWTableString.gswc/GSWTableString.gswd similarity index 100% rename from GSWExtensions.framework/GSWTableString.gswc/GSWTableString.gswd rename to GSWExtensions/GSWTableString.gswc/GSWTableString.gswd diff --git a/GSWExtensions.framework/GSWTableString.gswc/GSWTableString.gswi b/GSWExtensions/GSWTableString.gswc/GSWTableString.gswi similarity index 100% rename from GSWExtensions.framework/GSWTableString.gswc/GSWTableString.gswi rename to GSWExtensions/GSWTableString.gswc/GSWTableString.gswi diff --git a/GSWExtensions.framework/GSWTableString.gswc/GSWTableString.html b/GSWExtensions/GSWTableString.gswc/GSWTableString.html similarity index 100% rename from GSWExtensions.framework/GSWTableString.gswc/GSWTableString.html rename to GSWExtensions/GSWTableString.gswc/GSWTableString.html diff --git a/GSWExtensions.framework/Makefile.postamble b/GSWExtensions/Makefile.postamble similarity index 97% rename from GSWExtensions.framework/Makefile.postamble rename to GSWExtensions/Makefile.postamble index 26eb39e..bfd9159 100644 --- a/GSWExtensions.framework/Makefile.postamble +++ b/GSWExtensions/Makefile.postamble @@ -90,9 +90,9 @@ endif # contained in the GSWWOCompatibility.h header. # Currently this script is rather aggresive as it doesn't identify # whole words but merely patterns. -GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h +GSWWOReplaceScript.sed: ../GSWeb/GSWWOCompatibility.h $(ECHO_NOTHING)grep "^#define[[:space:]]*GSW.*[[:space:]]*WO.*" \ - ../GSWeb.framework/GSWWOCompatibility.h | \ + ../GSWeb/GSWWOCompatibility.h | \ sed -e 's/#define /s\//' \ -e 's/[[:space:]*]/\//' \ -e 's/[[:space:]*]//g' \ @@ -101,7 +101,7 @@ GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h # The script is copied instead of referenced as the relative path # from the $@ directory is unknown. Keep this rule in sync with -# GSWExtensionsGSW.framework/Makefile.postamble +# GSWExtensionsGSW/Makefile.postamble $(WOExtensions_COMPONENTS) $(WO_LOCALIZED_COMPONENTS): GSWWOReplaceScript.sed $(ECHO_NOTHING)cp -r $(subst .wo,.gswc,$(subst WO,GSW, $@)) $@ && \ cp GSWWOReplaceScript.sed $@ && \ diff --git a/GSWExtensions.framework/Makefile.preamble b/GSWExtensions/Makefile.preamble similarity index 93% rename from GSWExtensions.framework/Makefile.preamble rename to GSWExtensions/Makefile.preamble index 460445e..6bf2b50 100644 --- a/GSWExtensions.framework/Makefile.preamble +++ b/GSWExtensions/Makefile.preamble @@ -64,8 +64,8 @@ ADDITIONAL_CFLAGS = # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS = \ - -I../GSWeb.framework/$(GNUSTEP_TARGET_DIR) \ - -I../GSWeb.framework/derived_src + -I../GSWeb/$(GNUSTEP_TARGET_DIR) \ + -I../GSWeb/derived_src # Additional LDFLAGS to pass to the linker ADDITIONAL_LDFLAGS = @@ -97,11 +97,11 @@ endif ADDITIONAL_LIB_DIRS = ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes) -ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb.framework +ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb else #This is needed to strip GSW/WOExtensions from GNUSTEP_OBJ_DIR -GSWEB_LIBRARY_BASE = ../GSWeb.framework/GSWeb.framework -WO_LIBRARY_BASE = ../GSWeb.framework/WebObjects.framework +GSWEB_LIBRARY_BASE = ../GSWeb/GSWeb.framework +WO_LIBRARY_BASE = ../GSWeb/WebObjects.framework GSW_FRAMEWORK_SUFFIX = Versions/Current/$(GNUSTEP_TARGET_LDIR) GSWExtensions_LIB_DIRS = \ diff --git a/GSWExtensions.framework/Resources/Info-gnustep.plist b/GSWExtensions/Resources/Info-gnustep.plist similarity index 100% rename from GSWExtensions.framework/Resources/Info-gnustep.plist rename to GSWExtensions/Resources/Info-gnustep.plist diff --git a/GSWExtensions.framework/WOExtensions.h b/GSWExtensions/WOExtensions.h similarity index 100% rename from GSWExtensions.framework/WOExtensions.h rename to GSWExtensions/WOExtensions.h diff --git a/GSWExtensions.framework/WebServerResources/Ascending.png b/GSWExtensions/WebServerResources/Ascending.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/Ascending.png rename to GSWExtensions/WebServerResources/Ascending.png diff --git a/GSWExtensions.framework/WebServerResources/Descending.png b/GSWExtensions/WebServerResources/Descending.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/Descending.png rename to GSWExtensions/WebServerResources/Descending.png diff --git a/GSWExtensions.framework/WebServerResources/DownTriangle.png b/GSWExtensions/WebServerResources/DownTriangle.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/DownTriangle.png rename to GSWExtensions/WebServerResources/DownTriangle.png diff --git a/GSWExtensions.framework/WebServerResources/PoweredByGNUstep.png b/GSWExtensions/WebServerResources/PoweredByGNUstep.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/PoweredByGNUstep.png rename to GSWExtensions/WebServerResources/PoweredByGNUstep.png diff --git a/GSWExtensions.framework/WebServerResources/PoweredByGNUstepWeb.png b/GSWExtensions/WebServerResources/PoweredByGNUstepWeb.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/PoweredByGNUstepWeb.png rename to GSWExtensions/WebServerResources/PoweredByGNUstepWeb.png diff --git a/GSWExtensions.framework/WebServerResources/RightTriangle.png b/GSWExtensions/WebServerResources/RightTriangle.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/RightTriangle.png rename to GSWExtensions/WebServerResources/RightTriangle.png diff --git a/GSWExtensions.framework/WebServerResources/Unsorted.png b/GSWExtensions/WebServerResources/Unsorted.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/Unsorted.png rename to GSWExtensions/WebServerResources/Unsorted.png diff --git a/GSWExtensions.framework/WebServerResources/appOff.png b/GSWExtensions/WebServerResources/appOff.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/appOff.png rename to GSWExtensions/WebServerResources/appOff.png diff --git a/GSWExtensions.framework/WebServerResources/appOn.png b/GSWExtensions/WebServerResources/appOn.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/appOn.png rename to GSWExtensions/WebServerResources/appOn.png diff --git a/GSWExtensions.framework/WebServerResources/back.png b/GSWExtensions/WebServerResources/back.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/back.png rename to GSWExtensions/WebServerResources/back.png diff --git a/GSWExtensions.framework/WebServerResources/dir.png b/GSWExtensions/WebServerResources/dir.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/dir.png rename to GSWExtensions/WebServerResources/dir.png diff --git a/GSWExtensions.framework/WebServerResources/error.mng b/GSWExtensions/WebServerResources/error.mng similarity index 100% rename from GSWExtensions.framework/WebServerResources/error.mng rename to GSWExtensions/WebServerResources/error.mng diff --git a/GSWExtensions.framework/WebServerResources/exclamation.mng b/GSWExtensions/WebServerResources/exclamation.mng similarity index 100% rename from GSWExtensions.framework/WebServerResources/exclamation.mng rename to GSWExtensions/WebServerResources/exclamation.mng diff --git a/GSWExtensions.framework/WebServerResources/eye.png b/GSWExtensions/WebServerResources/eye.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/eye.png rename to GSWExtensions/WebServerResources/eye.png diff --git a/GSWExtensions.framework/WebServerResources/gswapp.png b/GSWExtensions/WebServerResources/gswapp.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/gswapp.png rename to GSWExtensions/WebServerResources/gswapp.png diff --git a/GSWExtensions.framework/WebServerResources/gswappsrv.png b/GSWExtensions/WebServerResources/gswappsrv.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/gswappsrv.png rename to GSWExtensions/WebServerResources/gswappsrv.png diff --git a/GSWExtensions.framework/WebServerResources/lft-OSarw.png b/GSWExtensions/WebServerResources/lft-OSarw.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/lft-OSarw.png rename to GSWExtensions/WebServerResources/lft-OSarw.png diff --git a/GSWExtensions.framework/WebServerResources/rt-OSarw.png b/GSWExtensions/WebServerResources/rt-OSarw.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/rt-OSarw.png rename to GSWExtensions/WebServerResources/rt-OSarw.png diff --git a/GSWExtensions.framework/WebServerResources/text.png b/GSWExtensions/WebServerResources/text.png similarity index 100% rename from GSWExtensions.framework/WebServerResources/text.png rename to GSWExtensions/WebServerResources/text.png diff --git a/GSWExtensions.framework/WebServerResources/warning.mng b/GSWExtensions/WebServerResources/warning.mng similarity index 100% rename from GSWExtensions.framework/WebServerResources/warning.mng rename to GSWExtensions/WebServerResources/warning.mng diff --git a/GSWExtensions.framework/bundle-info.plist b/GSWExtensions/bundle-info.plist similarity index 100% rename from GSWExtensions.framework/bundle-info.plist rename to GSWExtensions/bundle-info.plist diff --git a/GSWExtensions.framework/gswextensions.gsdoc b/GSWExtensions/gswextensions.gsdoc similarity index 100% rename from GSWExtensions.framework/gswextensions.gsdoc rename to GSWExtensions/gswextensions.gsdoc diff --git a/GSWExtensionsGSW.framework/.cvsignore b/GSWExtensionsGSW/.cvsignore similarity index 100% rename from GSWExtensionsGSW.framework/.cvsignore rename to GSWExtensionsGSW/.cvsignore diff --git a/GSWExtensionsGSW.framework/French.lproj/GSWLogin.gswc/GSWLogin.gswd b/GSWExtensionsGSW/French.lproj/GSWLogin.gswc/GSWLogin.gswd similarity index 100% rename from GSWExtensionsGSW.framework/French.lproj/GSWLogin.gswc/GSWLogin.gswd rename to GSWExtensionsGSW/French.lproj/GSWLogin.gswc/GSWLogin.gswd diff --git a/GSWExtensionsGSW.framework/French.lproj/GSWLogin.gswc/GSWLogin.html b/GSWExtensionsGSW/French.lproj/GSWLogin.gswc/GSWLogin.html similarity index 100% rename from GSWExtensionsGSW.framework/French.lproj/GSWLogin.gswc/GSWLogin.html rename to GSWExtensionsGSW/French.lproj/GSWLogin.gswc/GSWLogin.html diff --git a/GSWExtensionsGSW.framework/GNUmakefile b/GSWExtensionsGSW/GNUmakefile similarity index 100% rename from GSWExtensionsGSW.framework/GNUmakefile rename to GSWExtensionsGSW/GNUmakefile diff --git a/GSWExtensionsGSW.framework/GSWCacheElement.h b/GSWExtensionsGSW/GSWCacheElement.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWCacheElement.h rename to GSWExtensionsGSW/GSWCacheElement.h diff --git a/GSWExtensionsGSW.framework/GSWCacheElement.m b/GSWExtensionsGSW/GSWCacheElement.m similarity index 100% rename from GSWExtensionsGSW.framework/GSWCacheElement.m rename to GSWExtensionsGSW/GSWCacheElement.m diff --git a/GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h b/GSWExtensionsGSW/GSWExtGSWWOCompatibility.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h rename to GSWExtensionsGSW/GSWExtGSWWOCompatibility.h diff --git a/GSWExtensionsGSW.framework/GSWFileUploadComponent.gswc/GSWFileUploadComponent.gswd b/GSWExtensionsGSW/GSWFileUploadComponent.gswc/GSWFileUploadComponent.gswd similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadComponent.gswc/GSWFileUploadComponent.gswd rename to GSWExtensionsGSW/GSWFileUploadComponent.gswc/GSWFileUploadComponent.gswd diff --git a/GSWExtensionsGSW.framework/GSWFileUploadComponent.gswc/GSWFileUploadComponent.html b/GSWExtensionsGSW/GSWFileUploadComponent.gswc/GSWFileUploadComponent.html similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadComponent.gswc/GSWFileUploadComponent.html rename to GSWExtensionsGSW/GSWFileUploadComponent.gswc/GSWFileUploadComponent.html diff --git a/GSWExtensionsGSW.framework/GSWFileUploadComponent.h b/GSWExtensionsGSW/GSWFileUploadComponent.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadComponent.h rename to GSWExtensionsGSW/GSWFileUploadComponent.h diff --git a/GSWExtensionsGSW.framework/GSWFileUploadComponent.m b/GSWExtensionsGSW/GSWFileUploadComponent.m similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadComponent.m rename to GSWExtensionsGSW/GSWFileUploadComponent.m diff --git a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.gswd b/GSWExtensionsGSW/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.gswd similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.gswd rename to GSWExtensionsGSW/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.gswd diff --git a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.html b/GSWExtensionsGSW/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.html similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.html rename to GSWExtensionsGSW/GSWFileUploadFormComponent.gswc/GSWFileUploadFormComponent.html diff --git a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.h b/GSWExtensionsGSW/GSWFileUploadFormComponent.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadFormComponent.h rename to GSWExtensionsGSW/GSWFileUploadFormComponent.h diff --git a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m b/GSWExtensionsGSW/GSWFileUploadFormComponent.m similarity index 100% rename from GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m rename to GSWExtensionsGSW/GSWFileUploadFormComponent.m diff --git a/GSWExtensionsGSW.framework/GSWLogin.gswc/GSWLogin.gswd b/GSWExtensionsGSW/GSWLogin.gswc/GSWLogin.gswd similarity index 100% rename from GSWExtensionsGSW.framework/GSWLogin.gswc/GSWLogin.gswd rename to GSWExtensionsGSW/GSWLogin.gswc/GSWLogin.gswd diff --git a/GSWExtensionsGSW.framework/GSWLogin.gswc/GSWLogin.html b/GSWExtensionsGSW/GSWLogin.gswc/GSWLogin.html similarity index 100% rename from GSWExtensionsGSW.framework/GSWLogin.gswc/GSWLogin.html rename to GSWExtensionsGSW/GSWLogin.gswc/GSWLogin.html diff --git a/GSWExtensionsGSW.framework/GSWLogin.h b/GSWExtensionsGSW/GSWLogin.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWLogin.h rename to GSWExtensionsGSW/GSWLogin.h diff --git a/GSWExtensionsGSW.framework/GSWLogin.m b/GSWExtensionsGSW/GSWLogin.m similarity index 100% rename from GSWExtensionsGSW.framework/GSWLogin.m rename to GSWExtensionsGSW/GSWLogin.m diff --git a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.gswd b/GSWExtensionsGSW/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.gswd similarity index 100% rename from GSWExtensionsGSW.framework/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.gswd rename to GSWExtensionsGSW/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.gswd diff --git a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.html b/GSWExtensionsGSW/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.html similarity index 100% rename from GSWExtensionsGSW.framework/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.html rename to GSWExtensionsGSW/GSWSimpleFormComponent.gswc/GSWSimpleFormComponent.html diff --git a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.h b/GSWExtensionsGSW/GSWSimpleFormComponent.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWSimpleFormComponent.h rename to GSWExtensionsGSW/GSWSimpleFormComponent.h diff --git a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m b/GSWExtensionsGSW/GSWSimpleFormComponent.m similarity index 100% rename from GSWExtensionsGSW.framework/GSWSimpleFormComponent.m rename to GSWExtensionsGSW/GSWSimpleFormComponent.m diff --git a/GSWExtensionsGSW.framework/GSWTabComponent.gswc/GSWTabComponent.gswd b/GSWExtensionsGSW/GSWTabComponent.gswc/GSWTabComponent.gswd similarity index 100% rename from GSWExtensionsGSW.framework/GSWTabComponent.gswc/GSWTabComponent.gswd rename to GSWExtensionsGSW/GSWTabComponent.gswc/GSWTabComponent.gswd diff --git a/GSWExtensionsGSW.framework/GSWTabComponent.gswc/GSWTabComponent.html b/GSWExtensionsGSW/GSWTabComponent.gswc/GSWTabComponent.html similarity index 100% rename from GSWExtensionsGSW.framework/GSWTabComponent.gswc/GSWTabComponent.html rename to GSWExtensionsGSW/GSWTabComponent.gswc/GSWTabComponent.html diff --git a/GSWExtensionsGSW.framework/GSWTabComponent.h b/GSWExtensionsGSW/GSWTabComponent.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWTabComponent.h rename to GSWExtensionsGSW/GSWTabComponent.h diff --git a/GSWExtensionsGSW.framework/GSWTabComponent.m b/GSWExtensionsGSW/GSWTabComponent.m similarity index 100% rename from GSWExtensionsGSW.framework/GSWTabComponent.m rename to GSWExtensionsGSW/GSWTabComponent.m diff --git a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.gswd b/GSWExtensionsGSW/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.gswd similarity index 100% rename from GSWExtensionsGSW.framework/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.gswd rename to GSWExtensionsGSW/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.gswd diff --git a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.html b/GSWExtensionsGSW/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.html similarity index 100% rename from GSWExtensionsGSW.framework/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.html rename to GSWExtensionsGSW/GSWValidationFailureComponent.gswc/GSWValidationFailureComponent.html diff --git a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.h b/GSWExtensionsGSW/GSWValidationFailureComponent.h similarity index 100% rename from GSWExtensionsGSW.framework/GSWValidationFailureComponent.h rename to GSWExtensionsGSW/GSWValidationFailureComponent.h diff --git a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m b/GSWExtensionsGSW/GSWValidationFailureComponent.m similarity index 100% rename from GSWExtensionsGSW.framework/GSWValidationFailureComponent.m rename to GSWExtensionsGSW/GSWValidationFailureComponent.m diff --git a/GSWExtensionsGSW.framework/Makefile.postamble b/GSWExtensionsGSW/Makefile.postamble similarity index 96% rename from GSWExtensionsGSW.framework/Makefile.postamble rename to GSWExtensionsGSW/Makefile.postamble index 4e708d0..44c0bbf 100644 --- a/GSWExtensionsGSW.framework/Makefile.postamble +++ b/GSWExtensionsGSW/Makefile.postamble @@ -86,10 +86,10 @@ endif # Currently this script is rather aggresive as it doesn't identify # whole words but merely patterns. -GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h +GSWWOReplaceScript.sed: ../GSWeb/GSWWOCompatibility.h $(ECHO_NOTHING) \ grep "^#define[[:space:]]*GSW.*[[:space:]]*WO.*" \ - ../GSWeb.framework/GSWWOCompatibility.h | \ + ../GSWeb/GSWWOCompatibility.h | \ sed -e 's/#define /s\//' \ -e 's/[[:space:]*]/\//' \ -e 's/[[:space:]*]//g' \ @@ -99,7 +99,7 @@ GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h # The script is copied instead of referenced as the relative path # from the $@ directory is unknown. Keep this rule in sync with -# GSWExtensions.framework/Makefile.postamble +# GSWExtensions/Makefile.postamble $(WOExtensionsGSW_COMPONENTS): GSWWOReplaceScript.sed $(ECHO_NOTHING)cp -r $(subst .wo,.gswc,$(subst WO,GSW, $@)) $@ && \ cp GSWWOReplaceScript.sed $@ && \ diff --git a/GSWExtensionsGSW.framework/Makefile.preamble b/GSWExtensionsGSW/Makefile.preamble similarity index 92% rename from GSWExtensionsGSW.framework/Makefile.preamble rename to GSWExtensionsGSW/Makefile.preamble index f3cc802..75f3501 100644 --- a/GSWExtensionsGSW.framework/Makefile.preamble +++ b/GSWExtensionsGSW/Makefile.preamble @@ -64,8 +64,8 @@ ADDITIONAL_CFLAGS = # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS += \ - -I../GSWeb.framework/$(GNUSTEP_TARGET_DIR) \ - -I../GSWeb.framework/derived_src + -I../GSWeb/$(GNUSTEP_TARGET_DIR) \ + -I../GSWeb/derived_src # Additional LDFLAGS to pass to the linker ADDITIONAL_LDFLAGS = @@ -74,11 +74,11 @@ ADDITIONAL_LDFLAGS = ADDITIONAL_LIB_DIRS = ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes) -ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb.framework +ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb else #This is needed to strip GSW/WOExtensions from GNUSTEP_OBJ_DIR -GSWEB_LIBRARY_BASE = ../GSWeb.framework/GSWeb.framework -WO_LIBRARY_BASE = ../GSWeb.framework/WebObjects.framework +GSWEB_LIBRARY_BASE = ../GSWeb/GSWeb.framework +WO_LIBRARY_BASE = ../GSWeb/WebObjects.framework GSW_FRAMEWORK_SUFFIX = Versions/Current/$(GNUSTEP_TARGET_LDIR) GSWExtensionsGSW_LIB_DIRS = \ diff --git a/GSWExtensionsGSW.framework/Resources/Info-gnustep.plist b/GSWExtensionsGSW/Resources/Info-gnustep.plist similarity index 100% rename from GSWExtensionsGSW.framework/Resources/Info-gnustep.plist rename to GSWExtensionsGSW/Resources/Info-gnustep.plist diff --git a/GSWExtensionsGSW.framework/bundle-info.plist b/GSWExtensionsGSW/bundle-info.plist similarity index 100% rename from GSWExtensionsGSW.framework/bundle-info.plist rename to GSWExtensionsGSW/bundle-info.plist diff --git a/GSWExtensionsGSW.framework/gswextensionsgsw.gsdoc b/GSWExtensionsGSW/gswextensionsgsw.gsdoc similarity index 100% rename from GSWExtensionsGSW.framework/gswextensionsgsw.gsdoc rename to GSWExtensionsGSW/gswextensionsgsw.gsdoc diff --git a/GSWeb.framework/.cvsignore b/GSWeb/.cvsignore similarity index 100% rename from GSWeb.framework/.cvsignore rename to GSWeb/.cvsignore diff --git a/GSWeb.framework/DTDs/xhtml-lat1.ent b/GSWeb/DTDs/xhtml-lat1.ent similarity index 100% rename from GSWeb.framework/DTDs/xhtml-lat1.ent rename to GSWeb/DTDs/xhtml-lat1.ent diff --git a/GSWeb.framework/DTDs/xhtml-special.ent b/GSWeb/DTDs/xhtml-special.ent similarity index 100% rename from GSWeb.framework/DTDs/xhtml-special.ent rename to GSWeb/DTDs/xhtml-special.ent diff --git a/GSWeb.framework/DTDs/xhtml-symbol.ent b/GSWeb/DTDs/xhtml-symbol.ent similarity index 100% rename from GSWeb.framework/DTDs/xhtml-symbol.ent rename to GSWeb/DTDs/xhtml-symbol.ent diff --git a/GSWeb.framework/DTDs/xhtml1-frameset.dtd b/GSWeb/DTDs/xhtml1-frameset.dtd similarity index 100% rename from GSWeb.framework/DTDs/xhtml1-frameset.dtd rename to GSWeb/DTDs/xhtml1-frameset.dtd diff --git a/GSWeb.framework/DTDs/xhtml1-strict.dtd b/GSWeb/DTDs/xhtml1-strict.dtd similarity index 100% rename from GSWeb.framework/DTDs/xhtml1-strict.dtd rename to GSWeb/DTDs/xhtml1-strict.dtd diff --git a/GSWeb.framework/DTDs/xhtml1-transitional.dtd b/GSWeb/DTDs/xhtml1-transitional.dtd similarity index 100% rename from GSWeb.framework/DTDs/xhtml1-transitional.dtd rename to GSWeb/DTDs/xhtml1-transitional.dtd diff --git a/GSWeb.framework/GNUmakefile b/GSWeb/GNUmakefile similarity index 100% rename from GSWeb.framework/GNUmakefile rename to GSWeb/GNUmakefile diff --git a/GSWeb.framework/GSWAction.h b/GSWeb/GSWAction.h similarity index 100% rename from GSWeb.framework/GSWAction.h rename to GSWeb/GSWAction.h diff --git a/GSWeb.framework/GSWAction.m b/GSWeb/GSWAction.m similarity index 100% rename from GSWeb.framework/GSWAction.m rename to GSWeb/GSWAction.m diff --git a/GSWeb.framework/GSWActionRequestHandler.h b/GSWeb/GSWActionRequestHandler.h similarity index 100% rename from GSWeb.framework/GSWActionRequestHandler.h rename to GSWeb/GSWActionRequestHandler.h diff --git a/GSWeb.framework/GSWActionRequestHandler.m b/GSWeb/GSWActionRequestHandler.m similarity index 100% rename from GSWeb.framework/GSWActionRequestHandler.m rename to GSWeb/GSWActionRequestHandler.m diff --git a/GSWeb.framework/GSWActionURL.h b/GSWeb/GSWActionURL.h similarity index 100% rename from GSWeb.framework/GSWActionURL.h rename to GSWeb/GSWActionURL.h diff --git a/GSWeb.framework/GSWActionURL.m b/GSWeb/GSWActionURL.m similarity index 100% rename from GSWeb.framework/GSWActionURL.m rename to GSWeb/GSWActionURL.m diff --git a/GSWeb.framework/GSWActiveImage.h b/GSWeb/GSWActiveImage.h similarity index 100% rename from GSWeb.framework/GSWActiveImage.h rename to GSWeb/GSWActiveImage.h diff --git a/GSWeb.framework/GSWActiveImage.m b/GSWeb/GSWActiveImage.m similarity index 100% rename from GSWeb.framework/GSWActiveImage.m rename to GSWeb/GSWActiveImage.m diff --git a/GSWeb.framework/GSWAdaptor.h b/GSWeb/GSWAdaptor.h similarity index 100% rename from GSWeb.framework/GSWAdaptor.h rename to GSWeb/GSWAdaptor.h diff --git a/GSWeb.framework/GSWAdaptor.m b/GSWeb/GSWAdaptor.m similarity index 100% rename from GSWeb.framework/GSWAdaptor.m rename to GSWeb/GSWAdaptor.m diff --git a/GSWeb.framework/GSWApplet.h b/GSWeb/GSWApplet.h similarity index 100% rename from GSWeb.framework/GSWApplet.h rename to GSWeb/GSWApplet.h diff --git a/GSWeb.framework/GSWApplet.m b/GSWeb/GSWApplet.m similarity index 100% rename from GSWeb.framework/GSWApplet.m rename to GSWeb/GSWApplet.m diff --git a/GSWeb.framework/GSWApplication+Defaults.m b/GSWeb/GSWApplication+Defaults.m similarity index 100% rename from GSWeb.framework/GSWApplication+Defaults.m rename to GSWeb/GSWApplication+Defaults.m diff --git a/GSWeb.framework/GSWApplication.h b/GSWeb/GSWApplication.h similarity index 100% rename from GSWeb.framework/GSWApplication.h rename to GSWeb/GSWApplication.h diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb/GSWApplication.m similarity index 100% rename from GSWeb.framework/GSWApplication.m rename to GSWeb/GSWApplication.m diff --git a/GSWeb.framework/GSWAssociation.h b/GSWeb/GSWAssociation.h similarity index 100% rename from GSWeb.framework/GSWAssociation.h rename to GSWeb/GSWAssociation.h diff --git a/GSWeb.framework/GSWAssociation.m b/GSWeb/GSWAssociation.m similarity index 100% rename from GSWeb.framework/GSWAssociation.m rename to GSWeb/GSWAssociation.m diff --git a/GSWeb.framework/GSWBaseParser.h b/GSWeb/GSWBaseParser.h similarity index 100% rename from GSWeb.framework/GSWBaseParser.h rename to GSWeb/GSWBaseParser.h diff --git a/GSWeb.framework/GSWBaseParser.m b/GSWeb/GSWBaseParser.m similarity index 100% rename from GSWeb.framework/GSWBaseParser.m rename to GSWeb/GSWBaseParser.m diff --git a/GSWeb.framework/GSWBindingNameAssociation.h b/GSWeb/GSWBindingNameAssociation.h similarity index 100% rename from GSWeb.framework/GSWBindingNameAssociation.h rename to GSWeb/GSWBindingNameAssociation.h diff --git a/GSWeb.framework/GSWBindingNameAssociation.m b/GSWeb/GSWBindingNameAssociation.m similarity index 100% rename from GSWeb.framework/GSWBindingNameAssociation.m rename to GSWeb/GSWBindingNameAssociation.m diff --git a/GSWeb.framework/GSWBody.h b/GSWeb/GSWBody.h similarity index 100% rename from GSWeb.framework/GSWBody.h rename to GSWeb/GSWBody.h diff --git a/GSWeb.framework/GSWBody.m b/GSWeb/GSWBody.m similarity index 100% rename from GSWeb.framework/GSWBody.m rename to GSWeb/GSWBody.m diff --git a/GSWeb.framework/GSWBrowser.h b/GSWeb/GSWBrowser.h similarity index 100% rename from GSWeb.framework/GSWBrowser.h rename to GSWeb/GSWBrowser.h diff --git a/GSWeb.framework/GSWBrowser.m b/GSWeb/GSWBrowser.m similarity index 100% rename from GSWeb.framework/GSWBrowser.m rename to GSWeb/GSWBrowser.m diff --git a/GSWeb.framework/GSWBundle.h b/GSWeb/GSWBundle.h similarity index 100% rename from GSWeb.framework/GSWBundle.h rename to GSWeb/GSWBundle.h diff --git a/GSWeb.framework/GSWBundle.m b/GSWeb/GSWBundle.m similarity index 100% rename from GSWeb.framework/GSWBundle.m rename to GSWeb/GSWBundle.m diff --git a/GSWeb.framework/GSWCheckBox.h b/GSWeb/GSWCheckBox.h similarity index 100% rename from GSWeb.framework/GSWCheckBox.h rename to GSWeb/GSWCheckBox.h diff --git a/GSWeb.framework/GSWCheckBox.m b/GSWeb/GSWCheckBox.m similarity index 100% rename from GSWeb.framework/GSWCheckBox.m rename to GSWeb/GSWCheckBox.m diff --git a/GSWeb.framework/GSWCheckBoxList.h b/GSWeb/GSWCheckBoxList.h similarity index 100% rename from GSWeb.framework/GSWCheckBoxList.h rename to GSWeb/GSWCheckBoxList.h diff --git a/GSWeb.framework/GSWCheckBoxList.m b/GSWeb/GSWCheckBoxList.m similarity index 100% rename from GSWeb.framework/GSWCheckBoxList.m rename to GSWeb/GSWCheckBoxList.m diff --git a/GSWeb.framework/GSWClientSideScript.h b/GSWeb/GSWClientSideScript.h similarity index 100% rename from GSWeb.framework/GSWClientSideScript.h rename to GSWeb/GSWClientSideScript.h diff --git a/GSWeb.framework/GSWClientSideScript.m b/GSWeb/GSWClientSideScript.m similarity index 100% rename from GSWeb.framework/GSWClientSideScript.m rename to GSWeb/GSWClientSideScript.m diff --git a/GSWeb.framework/GSWComponent.h b/GSWeb/GSWComponent.h similarity index 100% rename from GSWeb.framework/GSWComponent.h rename to GSWeb/GSWComponent.h diff --git a/GSWeb.framework/GSWComponent.m b/GSWeb/GSWComponent.m similarity index 100% rename from GSWeb.framework/GSWComponent.m rename to GSWeb/GSWComponent.m diff --git a/GSWeb.framework/GSWComponentContent.h b/GSWeb/GSWComponentContent.h similarity index 100% rename from GSWeb.framework/GSWComponentContent.h rename to GSWeb/GSWComponentContent.h diff --git a/GSWeb.framework/GSWComponentContent.m b/GSWeb/GSWComponentContent.m similarity index 100% rename from GSWeb.framework/GSWComponentContent.m rename to GSWeb/GSWComponentContent.m diff --git a/GSWeb.framework/GSWComponentDefinition.h b/GSWeb/GSWComponentDefinition.h similarity index 100% rename from GSWeb.framework/GSWComponentDefinition.h rename to GSWeb/GSWComponentDefinition.h diff --git a/GSWeb.framework/GSWComponentDefinition.m b/GSWeb/GSWComponentDefinition.m similarity index 100% rename from GSWeb.framework/GSWComponentDefinition.m rename to GSWeb/GSWComponentDefinition.m diff --git a/GSWeb.framework/GSWComponentReference.h b/GSWeb/GSWComponentReference.h similarity index 100% rename from GSWeb.framework/GSWComponentReference.h rename to GSWeb/GSWComponentReference.h diff --git a/GSWeb.framework/GSWComponentReference.m b/GSWeb/GSWComponentReference.m similarity index 100% rename from GSWeb.framework/GSWComponentReference.m rename to GSWeb/GSWComponentReference.m diff --git a/GSWeb.framework/GSWComponentRequestHandler.h b/GSWeb/GSWComponentRequestHandler.h similarity index 100% rename from GSWeb.framework/GSWComponentRequestHandler.h rename to GSWeb/GSWComponentRequestHandler.h diff --git a/GSWeb.framework/GSWComponentRequestHandler.m b/GSWeb/GSWComponentRequestHandler.m similarity index 100% rename from GSWeb.framework/GSWComponentRequestHandler.m rename to GSWeb/GSWComponentRequestHandler.m diff --git a/GSWeb.framework/GSWConditional.h b/GSWeb/GSWConditional.h similarity index 100% rename from GSWeb.framework/GSWConditional.h rename to GSWeb/GSWConditional.h diff --git a/GSWeb.framework/GSWConditional.m b/GSWeb/GSWConditional.m similarity index 100% rename from GSWeb.framework/GSWConditional.m rename to GSWeb/GSWConditional.m diff --git a/GSWeb.framework/GSWConfig.h b/GSWeb/GSWConfig.h similarity index 100% rename from GSWeb.framework/GSWConfig.h rename to GSWeb/GSWConfig.h diff --git a/GSWeb.framework/GSWConstantValueAssociation.h b/GSWeb/GSWConstantValueAssociation.h similarity index 100% rename from GSWeb.framework/GSWConstantValueAssociation.h rename to GSWeb/GSWConstantValueAssociation.h diff --git a/GSWeb.framework/GSWConstantValueAssociation.m b/GSWeb/GSWConstantValueAssociation.m similarity index 100% rename from GSWeb.framework/GSWConstantValueAssociation.m rename to GSWeb/GSWConstantValueAssociation.m diff --git a/GSWeb.framework/GSWConstants.h b/GSWeb/GSWConstants.h similarity index 100% rename from GSWeb.framework/GSWConstants.h rename to GSWeb/GSWConstants.h diff --git a/GSWeb.framework/GSWConstants.m b/GSWeb/GSWConstants.m similarity index 100% rename from GSWeb.framework/GSWConstants.m rename to GSWeb/GSWConstants.m diff --git a/GSWeb.framework/GSWContext.h b/GSWeb/GSWContext.h similarity index 100% rename from GSWeb.framework/GSWContext.h rename to GSWeb/GSWContext.h diff --git a/GSWeb.framework/GSWContext.m b/GSWeb/GSWContext.m similarity index 100% rename from GSWeb.framework/GSWContext.m rename to GSWeb/GSWContext.m diff --git a/GSWeb.framework/GSWCookie.h b/GSWeb/GSWCookie.h similarity index 100% rename from GSWeb.framework/GSWCookie.h rename to GSWeb/GSWCookie.h diff --git a/GSWeb.framework/GSWCookie.m b/GSWeb/GSWCookie.m similarity index 100% rename from GSWeb.framework/GSWCookie.m rename to GSWeb/GSWCookie.m diff --git a/GSWeb.framework/GSWDebug.h b/GSWeb/GSWDebug.h similarity index 100% rename from GSWeb.framework/GSWDebug.h rename to GSWeb/GSWDebug.h diff --git a/GSWeb.framework/GSWDebug.m b/GSWeb/GSWDebug.m similarity index 100% rename from GSWeb.framework/GSWDebug.m rename to GSWeb/GSWDebug.m diff --git a/GSWeb.framework/GSWDeclaration.h b/GSWeb/GSWDeclaration.h similarity index 100% rename from GSWeb.framework/GSWDeclaration.h rename to GSWeb/GSWDeclaration.h diff --git a/GSWeb.framework/GSWDeclaration.m b/GSWeb/GSWDeclaration.m similarity index 100% rename from GSWeb.framework/GSWDeclaration.m rename to GSWeb/GSWDeclaration.m diff --git a/GSWeb.framework/GSWDeclarationParser.h b/GSWeb/GSWDeclarationParser.h similarity index 100% rename from GSWeb.framework/GSWDeclarationParser.h rename to GSWeb/GSWDeclarationParser.h diff --git a/GSWeb.framework/GSWDeclarationParser.m b/GSWeb/GSWDeclarationParser.m similarity index 100% rename from GSWeb.framework/GSWDeclarationParser.m rename to GSWeb/GSWDeclarationParser.m diff --git a/GSWeb.framework/GSWDefaultAdaptor.h b/GSWeb/GSWDefaultAdaptor.h similarity index 100% rename from GSWeb.framework/GSWDefaultAdaptor.h rename to GSWeb/GSWDefaultAdaptor.h diff --git a/GSWeb.framework/GSWDefaultAdaptor.m b/GSWeb/GSWDefaultAdaptor.m similarity index 100% rename from GSWeb.framework/GSWDefaultAdaptor.m rename to GSWeb/GSWDefaultAdaptor.m diff --git a/GSWeb.framework/GSWDefines.h b/GSWeb/GSWDefines.h similarity index 100% rename from GSWeb.framework/GSWDefines.h rename to GSWeb/GSWDefines.h diff --git a/GSWeb.framework/GSWDeployedBundle.h b/GSWeb/GSWDeployedBundle.h similarity index 100% rename from GSWeb.framework/GSWDeployedBundle.h rename to GSWeb/GSWDeployedBundle.h diff --git a/GSWeb.framework/GSWDeployedBundle.m b/GSWeb/GSWDeployedBundle.m similarity index 100% rename from GSWeb.framework/GSWDeployedBundle.m rename to GSWeb/GSWDeployedBundle.m diff --git a/GSWeb.framework/GSWDirectAction.h b/GSWeb/GSWDirectAction.h similarity index 100% rename from GSWeb.framework/GSWDirectAction.h rename to GSWeb/GSWDirectAction.h diff --git a/GSWeb.framework/GSWDirectAction.m b/GSWeb/GSWDirectAction.m similarity index 100% rename from GSWeb.framework/GSWDirectAction.m rename to GSWeb/GSWDirectAction.m diff --git a/GSWeb.framework/GSWDirectActionRequestHandler.h b/GSWeb/GSWDirectActionRequestHandler.h similarity index 100% rename from GSWeb.framework/GSWDirectActionRequestHandler.h rename to GSWeb/GSWDirectActionRequestHandler.h diff --git a/GSWeb.framework/GSWDirectActionRequestHandler.m b/GSWeb/GSWDirectActionRequestHandler.m similarity index 100% rename from GSWeb.framework/GSWDirectActionRequestHandler.m rename to GSWeb/GSWDirectActionRequestHandler.m diff --git a/GSWeb.framework/GSWDynamicElement.h b/GSWeb/GSWDynamicElement.h similarity index 100% rename from GSWeb.framework/GSWDynamicElement.h rename to GSWeb/GSWDynamicElement.h diff --git a/GSWeb.framework/GSWDynamicElement.m b/GSWeb/GSWDynamicElement.m similarity index 100% rename from GSWeb.framework/GSWDynamicElement.m rename to GSWeb/GSWDynamicElement.m diff --git a/GSWeb.framework/GSWDynamicGroup.h b/GSWeb/GSWDynamicGroup.h similarity index 100% rename from GSWeb.framework/GSWDynamicGroup.h rename to GSWeb/GSWDynamicGroup.h diff --git a/GSWeb.framework/GSWDynamicGroup.m b/GSWeb/GSWDynamicGroup.m similarity index 100% rename from GSWeb.framework/GSWDynamicGroup.m rename to GSWeb/GSWDynamicGroup.m diff --git a/GSWeb.framework/GSWDynamicURLString.h b/GSWeb/GSWDynamicURLString.h similarity index 100% rename from GSWeb.framework/GSWDynamicURLString.h rename to GSWeb/GSWDynamicURLString.h diff --git a/GSWeb.framework/GSWDynamicURLString.m b/GSWeb/GSWDynamicURLString.m similarity index 100% rename from GSWeb.framework/GSWDynamicURLString.m rename to GSWeb/GSWDynamicURLString.m diff --git a/GSWeb.framework/GSWElement.h b/GSWeb/GSWElement.h similarity index 100% rename from GSWeb.framework/GSWElement.h rename to GSWeb/GSWElement.h diff --git a/GSWeb.framework/GSWElement.m b/GSWeb/GSWElement.m similarity index 100% rename from GSWeb.framework/GSWElement.m rename to GSWeb/GSWElement.m diff --git a/GSWeb.framework/GSWElementID.h b/GSWeb/GSWElementID.h similarity index 100% rename from GSWeb.framework/GSWElementID.h rename to GSWeb/GSWElementID.h diff --git a/GSWeb.framework/GSWElementID.m b/GSWeb/GSWElementID.m similarity index 100% rename from GSWeb.framework/GSWElementID.m rename to GSWeb/GSWElementID.m diff --git a/GSWeb.framework/GSWEmbeddedObject.h b/GSWeb/GSWEmbeddedObject.h similarity index 100% rename from GSWeb.framework/GSWEmbeddedObject.h rename to GSWeb/GSWEmbeddedObject.h diff --git a/GSWeb.framework/GSWEmbeddedObject.m b/GSWeb/GSWEmbeddedObject.m similarity index 100% rename from GSWeb.framework/GSWEmbeddedObject.m rename to GSWeb/GSWEmbeddedObject.m diff --git a/GSWeb.framework/GSWFileUpload.h b/GSWeb/GSWFileUpload.h similarity index 100% rename from GSWeb.framework/GSWFileUpload.h rename to GSWeb/GSWFileUpload.h diff --git a/GSWeb.framework/GSWFileUpload.m b/GSWeb/GSWFileUpload.m similarity index 100% rename from GSWeb.framework/GSWFileUpload.m rename to GSWeb/GSWFileUpload.m diff --git a/GSWeb.framework/GSWForm.h b/GSWeb/GSWForm.h similarity index 100% rename from GSWeb.framework/GSWForm.h rename to GSWeb/GSWForm.h diff --git a/GSWeb.framework/GSWForm.m b/GSWeb/GSWForm.m similarity index 100% rename from GSWeb.framework/GSWForm.m rename to GSWeb/GSWForm.m diff --git a/GSWeb.framework/GSWFrame.h b/GSWeb/GSWFrame.h similarity index 100% rename from GSWeb.framework/GSWFrame.h rename to GSWeb/GSWFrame.h diff --git a/GSWeb.framework/GSWFrame.m b/GSWeb/GSWFrame.m similarity index 100% rename from GSWeb.framework/GSWFrame.m rename to GSWeb/GSWFrame.m diff --git a/GSWeb.framework/GSWGenericContainer.h b/GSWeb/GSWGenericContainer.h similarity index 100% rename from GSWeb.framework/GSWGenericContainer.h rename to GSWeb/GSWGenericContainer.h diff --git a/GSWeb.framework/GSWGenericContainer.m b/GSWeb/GSWGenericContainer.m similarity index 100% rename from GSWeb.framework/GSWGenericContainer.m rename to GSWeb/GSWGenericContainer.m diff --git a/GSWeb.framework/GSWGenericElement.h b/GSWeb/GSWGenericElement.h similarity index 100% rename from GSWeb.framework/GSWGenericElement.h rename to GSWeb/GSWGenericElement.h diff --git a/GSWeb.framework/GSWGenericElement.m b/GSWeb/GSWGenericElement.m similarity index 100% rename from GSWeb.framework/GSWGenericElement.m rename to GSWeb/GSWGenericElement.m diff --git a/GSWeb.framework/GSWGeometricRegion.h b/GSWeb/GSWGeometricRegion.h similarity index 100% rename from GSWeb.framework/GSWGeometricRegion.h rename to GSWeb/GSWGeometricRegion.h diff --git a/GSWeb.framework/GSWGeometricRegion.m b/GSWeb/GSWGeometricRegion.m similarity index 100% rename from GSWeb.framework/GSWGeometricRegion.m rename to GSWeb/GSWGeometricRegion.m diff --git a/GSWeb.framework/GSWHTMLBareString.h b/GSWeb/GSWHTMLBareString.h similarity index 100% rename from GSWeb.framework/GSWHTMLBareString.h rename to GSWeb/GSWHTMLBareString.h diff --git a/GSWeb.framework/GSWHTMLBareString.m b/GSWeb/GSWHTMLBareString.m similarity index 100% rename from GSWeb.framework/GSWHTMLBareString.m rename to GSWeb/GSWHTMLBareString.m diff --git a/GSWeb.framework/GSWHTMLComment.h b/GSWeb/GSWHTMLComment.h similarity index 100% rename from GSWeb.framework/GSWHTMLComment.h rename to GSWeb/GSWHTMLComment.h diff --git a/GSWeb.framework/GSWHTMLComment.m b/GSWeb/GSWHTMLComment.m similarity index 100% rename from GSWeb.framework/GSWHTMLComment.m rename to GSWeb/GSWHTMLComment.m diff --git a/GSWeb.framework/GSWHTMLDynamicElement.h b/GSWeb/GSWHTMLDynamicElement.h similarity index 100% rename from GSWeb.framework/GSWHTMLDynamicElement.h rename to GSWeb/GSWHTMLDynamicElement.h diff --git a/GSWeb.framework/GSWHTMLDynamicElement.m b/GSWeb/GSWHTMLDynamicElement.m similarity index 100% rename from GSWeb.framework/GSWHTMLDynamicElement.m rename to GSWeb/GSWHTMLDynamicElement.m diff --git a/GSWeb.framework/GSWHTMLRawParser.h b/GSWeb/GSWHTMLRawParser.h similarity index 100% rename from GSWeb.framework/GSWHTMLRawParser.h rename to GSWeb/GSWHTMLRawParser.h diff --git a/GSWeb.framework/GSWHTMLRawParser.m b/GSWeb/GSWHTMLRawParser.m similarity index 100% rename from GSWeb.framework/GSWHTMLRawParser.m rename to GSWeb/GSWHTMLRawParser.m diff --git a/GSWeb.framework/GSWHTMLStaticElement.h b/GSWeb/GSWHTMLStaticElement.h similarity index 100% rename from GSWeb.framework/GSWHTMLStaticElement.h rename to GSWeb/GSWHTMLStaticElement.h diff --git a/GSWeb.framework/GSWHTMLStaticElement.m b/GSWeb/GSWHTMLStaticElement.m similarity index 100% rename from GSWeb.framework/GSWHTMLStaticElement.m rename to GSWeb/GSWHTMLStaticElement.m diff --git a/GSWeb.framework/GSWHTMLStaticGroup.h b/GSWeb/GSWHTMLStaticGroup.h similarity index 100% rename from GSWeb.framework/GSWHTMLStaticGroup.h rename to GSWeb/GSWHTMLStaticGroup.h diff --git a/GSWeb.framework/GSWHTMLStaticGroup.m b/GSWeb/GSWHTMLStaticGroup.m similarity index 100% rename from GSWeb.framework/GSWHTMLStaticGroup.m rename to GSWeb/GSWHTMLStaticGroup.m diff --git a/GSWeb.framework/GSWHTMLTemplateParser.h b/GSWeb/GSWHTMLTemplateParser.h similarity index 100% rename from GSWeb.framework/GSWHTMLTemplateParser.h rename to GSWeb/GSWHTMLTemplateParser.h diff --git a/GSWeb.framework/GSWHTMLTemplateParser.m b/GSWeb/GSWHTMLTemplateParser.m similarity index 100% rename from GSWeb.framework/GSWHTMLTemplateParser.m rename to GSWeb/GSWHTMLTemplateParser.m diff --git a/GSWeb.framework/GSWHTMLURLValuedElement.h b/GSWeb/GSWHTMLURLValuedElement.h similarity index 100% rename from GSWeb.framework/GSWHTMLURLValuedElement.h rename to GSWeb/GSWHTMLURLValuedElement.h diff --git a/GSWeb.framework/GSWHTMLURLValuedElement.m b/GSWeb/GSWHTMLURLValuedElement.m similarity index 100% rename from GSWeb.framework/GSWHTMLURLValuedElement.m rename to GSWeb/GSWHTMLURLValuedElement.m diff --git a/GSWeb.framework/GSWHTTPIO.h b/GSWeb/GSWHTTPIO.h similarity index 100% rename from GSWeb.framework/GSWHTTPIO.h rename to GSWeb/GSWHTTPIO.h diff --git a/GSWeb.framework/GSWHTTPIO.m b/GSWeb/GSWHTTPIO.m similarity index 100% rename from GSWeb.framework/GSWHTTPIO.m rename to GSWeb/GSWHTTPIO.m diff --git a/GSWeb.framework/GSWHiddenField.h b/GSWeb/GSWHiddenField.h similarity index 100% rename from GSWeb.framework/GSWHiddenField.h rename to GSWeb/GSWHiddenField.h diff --git a/GSWeb.framework/GSWHiddenField.m b/GSWeb/GSWHiddenField.m similarity index 100% rename from GSWeb.framework/GSWHiddenField.m rename to GSWeb/GSWHiddenField.m diff --git a/GSWeb.framework/GSWHyperlink.h b/GSWeb/GSWHyperlink.h similarity index 100% rename from GSWeb.framework/GSWHyperlink.h rename to GSWeb/GSWHyperlink.h diff --git a/GSWeb.framework/GSWHyperlink.m b/GSWeb/GSWHyperlink.m similarity index 100% rename from GSWeb.framework/GSWHyperlink.m rename to GSWeb/GSWHyperlink.m diff --git a/GSWeb.framework/GSWImage.h b/GSWeb/GSWImage.h similarity index 100% rename from GSWeb.framework/GSWImage.h rename to GSWeb/GSWImage.h diff --git a/GSWeb.framework/GSWImage.m b/GSWeb/GSWImage.m similarity index 100% rename from GSWeb.framework/GSWImage.m rename to GSWeb/GSWImage.m diff --git a/GSWeb.framework/GSWImageButton.h b/GSWeb/GSWImageButton.h similarity index 100% rename from GSWeb.framework/GSWImageButton.h rename to GSWeb/GSWImageButton.h diff --git a/GSWeb.framework/GSWImageButton.m b/GSWeb/GSWImageButton.m similarity index 100% rename from GSWeb.framework/GSWImageButton.m rename to GSWeb/GSWImageButton.m diff --git a/GSWeb.framework/GSWImageInfo.h b/GSWeb/GSWImageInfo.h similarity index 100% rename from GSWeb.framework/GSWImageInfo.h rename to GSWeb/GSWImageInfo.h diff --git a/GSWeb.framework/GSWImageInfo.m b/GSWeb/GSWImageInfo.m similarity index 100% rename from GSWeb.framework/GSWImageInfo.m rename to GSWeb/GSWImageInfo.m diff --git a/GSWeb.framework/GSWInput.h b/GSWeb/GSWInput.h similarity index 100% rename from GSWeb.framework/GSWInput.h rename to GSWeb/GSWInput.h diff --git a/GSWeb.framework/GSWInput.m b/GSWeb/GSWInput.m similarity index 100% rename from GSWeb.framework/GSWInput.m rename to GSWeb/GSWInput.m diff --git a/GSWeb.framework/GSWInputStreamData.h b/GSWeb/GSWInputStreamData.h similarity index 100% rename from GSWeb.framework/GSWInputStreamData.h rename to GSWeb/GSWInputStreamData.h diff --git a/GSWeb.framework/GSWInputStreamData.m b/GSWeb/GSWInputStreamData.m similarity index 100% rename from GSWeb.framework/GSWInputStreamData.m rename to GSWeb/GSWInputStreamData.m diff --git a/GSWeb.framework/GSWJavaScript.h b/GSWeb/GSWJavaScript.h similarity index 100% rename from GSWeb.framework/GSWJavaScript.h rename to GSWeb/GSWJavaScript.h diff --git a/GSWeb.framework/GSWJavaScript.m b/GSWeb/GSWJavaScript.m similarity index 100% rename from GSWeb.framework/GSWJavaScript.m rename to GSWeb/GSWJavaScript.m diff --git a/GSWeb.framework/GSWKeyValueAssociation.h b/GSWeb/GSWKeyValueAssociation.h similarity index 100% rename from GSWeb.framework/GSWKeyValueAssociation.h rename to GSWeb/GSWKeyValueAssociation.h diff --git a/GSWeb.framework/GSWKeyValueAssociation.m b/GSWeb/GSWKeyValueAssociation.m similarity index 100% rename from GSWeb.framework/GSWKeyValueAssociation.m rename to GSWeb/GSWKeyValueAssociation.m diff --git a/GSWeb.framework/GSWLifebeatThread.h b/GSWeb/GSWLifebeatThread.h similarity index 100% rename from GSWeb.framework/GSWLifebeatThread.h rename to GSWeb/GSWLifebeatThread.h diff --git a/GSWeb.framework/GSWLifebeatThread.m b/GSWeb/GSWLifebeatThread.m similarity index 100% rename from GSWeb.framework/GSWLifebeatThread.m rename to GSWeb/GSWLifebeatThread.m diff --git a/GSWeb.framework/GSWMailDelivery.h b/GSWeb/GSWMailDelivery.h similarity index 100% rename from GSWeb.framework/GSWMailDelivery.h rename to GSWeb/GSWMailDelivery.h diff --git a/GSWeb.framework/GSWMailDelivery.m b/GSWeb/GSWMailDelivery.m similarity index 100% rename from GSWeb.framework/GSWMailDelivery.m rename to GSWeb/GSWMailDelivery.m diff --git a/GSWeb.framework/GSWMessage.h b/GSWeb/GSWMessage.h similarity index 100% rename from GSWeb.framework/GSWMessage.h rename to GSWeb/GSWMessage.h diff --git a/GSWeb.framework/GSWMessage.m b/GSWeb/GSWMessage.m similarity index 100% rename from GSWeb.framework/GSWMessage.m rename to GSWeb/GSWMessage.m diff --git a/GSWeb.framework/GSWMultiKeyDictionary.h b/GSWeb/GSWMultiKeyDictionary.h similarity index 100% rename from GSWeb.framework/GSWMultiKeyDictionary.h rename to GSWeb/GSWMultiKeyDictionary.h diff --git a/GSWeb.framework/GSWMultiKeyDictionary.m b/GSWeb/GSWMultiKeyDictionary.m similarity index 100% rename from GSWeb.framework/GSWMultiKeyDictionary.m rename to GSWeb/GSWMultiKeyDictionary.m diff --git a/GSWeb.framework/GSWNestedList.h b/GSWeb/GSWNestedList.h similarity index 100% rename from GSWeb.framework/GSWNestedList.h rename to GSWeb/GSWNestedList.h diff --git a/GSWeb.framework/GSWNestedList.m b/GSWeb/GSWNestedList.m similarity index 100% rename from GSWeb.framework/GSWNestedList.m rename to GSWeb/GSWNestedList.m diff --git a/GSWeb.framework/GSWParam.h b/GSWeb/GSWParam.h similarity index 100% rename from GSWeb.framework/GSWParam.h rename to GSWeb/GSWParam.h diff --git a/GSWeb.framework/GSWParam.m b/GSWeb/GSWParam.m similarity index 100% rename from GSWeb.framework/GSWParam.m rename to GSWeb/GSWParam.m diff --git a/GSWeb.framework/GSWPasswordField.h b/GSWeb/GSWPasswordField.h similarity index 100% rename from GSWeb.framework/GSWPasswordField.h rename to GSWeb/GSWPasswordField.h diff --git a/GSWeb.framework/GSWPasswordField.m b/GSWeb/GSWPasswordField.m similarity index 100% rename from GSWeb.framework/GSWPasswordField.m rename to GSWeb/GSWPasswordField.m diff --git a/GSWeb.framework/GSWPngImageInfo.h b/GSWeb/GSWPngImageInfo.h similarity index 100% rename from GSWeb.framework/GSWPngImageInfo.h rename to GSWeb/GSWPngImageInfo.h diff --git a/GSWeb.framework/GSWPngImageInfo.m b/GSWeb/GSWPngImageInfo.m similarity index 100% rename from GSWeb.framework/GSWPngImageInfo.m rename to GSWeb/GSWPngImageInfo.m diff --git a/GSWeb.framework/GSWPopUpButton.h b/GSWeb/GSWPopUpButton.h similarity index 100% rename from GSWeb.framework/GSWPopUpButton.h rename to GSWeb/GSWPopUpButton.h diff --git a/GSWeb.framework/GSWPopUpButton.m b/GSWeb/GSWPopUpButton.m similarity index 100% rename from GSWeb.framework/GSWPopUpButton.m rename to GSWeb/GSWPopUpButton.m diff --git a/GSWeb.framework/GSWPrivate.h b/GSWeb/GSWPrivate.h similarity index 100% rename from GSWeb.framework/GSWPrivate.h rename to GSWeb/GSWPrivate.h diff --git a/GSWeb.framework/GSWProcFS.h b/GSWeb/GSWProcFS.h similarity index 100% rename from GSWeb.framework/GSWProcFS.h rename to GSWeb/GSWProcFS.h diff --git a/GSWeb.framework/GSWProcFS.m b/GSWeb/GSWProcFS.m similarity index 100% rename from GSWeb.framework/GSWProcFS.m rename to GSWeb/GSWProcFS.m diff --git a/GSWeb.framework/GSWProjectBundle.h b/GSWeb/GSWProjectBundle.h similarity index 100% rename from GSWeb.framework/GSWProjectBundle.h rename to GSWeb/GSWProjectBundle.h diff --git a/GSWeb.framework/GSWProjectBundle.m b/GSWeb/GSWProjectBundle.m similarity index 100% rename from GSWeb.framework/GSWProjectBundle.m rename to GSWeb/GSWProjectBundle.m diff --git a/GSWeb.framework/GSWQuickTime.h b/GSWeb/GSWQuickTime.h similarity index 100% rename from GSWeb.framework/GSWQuickTime.h rename to GSWeb/GSWQuickTime.h diff --git a/GSWeb.framework/GSWRadioButton.h b/GSWeb/GSWRadioButton.h similarity index 100% rename from GSWeb.framework/GSWRadioButton.h rename to GSWeb/GSWRadioButton.h diff --git a/GSWeb.framework/GSWRadioButton.m b/GSWeb/GSWRadioButton.m similarity index 100% rename from GSWeb.framework/GSWRadioButton.m rename to GSWeb/GSWRadioButton.m diff --git a/GSWeb.framework/GSWRadioButtonList.h b/GSWeb/GSWRadioButtonList.h similarity index 100% rename from GSWeb.framework/GSWRadioButtonList.h rename to GSWeb/GSWRadioButtonList.h diff --git a/GSWeb.framework/GSWRadioButtonList.m b/GSWeb/GSWRadioButtonList.m similarity index 100% rename from GSWeb.framework/GSWRadioButtonList.m rename to GSWeb/GSWRadioButtonList.m diff --git a/GSWeb.framework/GSWRecording.h b/GSWeb/GSWRecording.h similarity index 100% rename from GSWeb.framework/GSWRecording.h rename to GSWeb/GSWRecording.h diff --git a/GSWeb.framework/GSWRecording.m b/GSWeb/GSWRecording.m similarity index 100% rename from GSWeb.framework/GSWRecording.m rename to GSWeb/GSWRecording.m diff --git a/GSWeb.framework/GSWRepetition.h b/GSWeb/GSWRepetition.h similarity index 100% rename from GSWeb.framework/GSWRepetition.h rename to GSWeb/GSWRepetition.h diff --git a/GSWeb.framework/GSWRepetition.m b/GSWeb/GSWRepetition.m similarity index 100% rename from GSWeb.framework/GSWRepetition.m rename to GSWeb/GSWRepetition.m diff --git a/GSWeb.framework/GSWRequest.h b/GSWeb/GSWRequest.h similarity index 100% rename from GSWeb.framework/GSWRequest.h rename to GSWeb/GSWRequest.h diff --git a/GSWeb.framework/GSWRequest.m b/GSWeb/GSWRequest.m similarity index 100% rename from GSWeb.framework/GSWRequest.m rename to GSWeb/GSWRequest.m diff --git a/GSWeb.framework/GSWRequestHandler.h b/GSWeb/GSWRequestHandler.h similarity index 100% rename from GSWeb.framework/GSWRequestHandler.h rename to GSWeb/GSWRequestHandler.h diff --git a/GSWeb.framework/GSWRequestHandler.m b/GSWeb/GSWRequestHandler.m similarity index 100% rename from GSWeb.framework/GSWRequestHandler.m rename to GSWeb/GSWRequestHandler.m diff --git a/GSWeb.framework/GSWResetButton.h b/GSWeb/GSWResetButton.h similarity index 100% rename from GSWeb.framework/GSWResetButton.h rename to GSWeb/GSWResetButton.h diff --git a/GSWeb.framework/GSWResetButton.m b/GSWeb/GSWResetButton.m similarity index 100% rename from GSWeb.framework/GSWResetButton.m rename to GSWeb/GSWResetButton.m diff --git a/GSWeb.framework/GSWResourceManager.h b/GSWeb/GSWResourceManager.h similarity index 100% rename from GSWeb.framework/GSWResourceManager.h rename to GSWeb/GSWResourceManager.h diff --git a/GSWeb.framework/GSWResourceManager.m b/GSWeb/GSWResourceManager.m similarity index 100% rename from GSWeb.framework/GSWResourceManager.m rename to GSWeb/GSWResourceManager.m diff --git a/GSWeb.framework/GSWResourceRequestHandler.h b/GSWeb/GSWResourceRequestHandler.h similarity index 100% rename from GSWeb.framework/GSWResourceRequestHandler.h rename to GSWeb/GSWResourceRequestHandler.h diff --git a/GSWeb.framework/GSWResourceRequestHandler.m b/GSWeb/GSWResourceRequestHandler.m similarity index 100% rename from GSWeb.framework/GSWResourceRequestHandler.m rename to GSWeb/GSWResourceRequestHandler.m diff --git a/GSWeb.framework/GSWResourceURL.h b/GSWeb/GSWResourceURL.h similarity index 100% rename from GSWeb.framework/GSWResourceURL.h rename to GSWeb/GSWResourceURL.h diff --git a/GSWeb.framework/GSWResourceURL.m b/GSWeb/GSWResourceURL.m similarity index 100% rename from GSWeb.framework/GSWResourceURL.m rename to GSWeb/GSWResourceURL.m diff --git a/GSWeb.framework/GSWResponse.h b/GSWeb/GSWResponse.h similarity index 100% rename from GSWeb.framework/GSWResponse.h rename to GSWeb/GSWResponse.h diff --git a/GSWeb.framework/GSWResponse.m b/GSWeb/GSWResponse.m similarity index 100% rename from GSWeb.framework/GSWResponse.m rename to GSWeb/GSWResponse.m diff --git a/GSWeb.framework/GSWServerSessionStore.h b/GSWeb/GSWServerSessionStore.h similarity index 100% rename from GSWeb.framework/GSWServerSessionStore.h rename to GSWeb/GSWServerSessionStore.h diff --git a/GSWeb.framework/GSWServerSessionStore.m b/GSWeb/GSWServerSessionStore.m similarity index 100% rename from GSWeb.framework/GSWServerSessionStore.m rename to GSWeb/GSWServerSessionStore.m diff --git a/GSWeb.framework/GSWSession.h b/GSWeb/GSWSession.h similarity index 100% rename from GSWeb.framework/GSWSession.h rename to GSWeb/GSWSession.h diff --git a/GSWeb.framework/GSWSession.m b/GSWeb/GSWSession.m similarity index 100% rename from GSWeb.framework/GSWSession.m rename to GSWeb/GSWSession.m diff --git a/GSWeb.framework/GSWSessionStore.h b/GSWeb/GSWSessionStore.h similarity index 100% rename from GSWeb.framework/GSWSessionStore.h rename to GSWeb/GSWSessionStore.h diff --git a/GSWeb.framework/GSWSessionStore.m b/GSWeb/GSWSessionStore.m similarity index 100% rename from GSWeb.framework/GSWSessionStore.m rename to GSWeb/GSWSessionStore.m diff --git a/GSWeb.framework/GSWSessionTimeOut.h b/GSWeb/GSWSessionTimeOut.h similarity index 100% rename from GSWeb.framework/GSWSessionTimeOut.h rename to GSWeb/GSWSessionTimeOut.h diff --git a/GSWeb.framework/GSWSessionTimeOut.m b/GSWeb/GSWSessionTimeOut.m similarity index 100% rename from GSWeb.framework/GSWSessionTimeOut.m rename to GSWeb/GSWSessionTimeOut.m diff --git a/GSWeb.framework/GSWSessionTimeOutManager.h b/GSWeb/GSWSessionTimeOutManager.h similarity index 100% rename from GSWeb.framework/GSWSessionTimeOutManager.h rename to GSWeb/GSWSessionTimeOutManager.h diff --git a/GSWeb.framework/GSWSessionTimeOutManager.m b/GSWeb/GSWSessionTimeOutManager.m similarity index 100% rename from GSWeb.framework/GSWSessionTimeOutManager.m rename to GSWeb/GSWSessionTimeOutManager.m diff --git a/GSWeb.framework/GSWStaticResourceRequestHandler.h b/GSWeb/GSWStaticResourceRequestHandler.h similarity index 100% rename from GSWeb.framework/GSWStaticResourceRequestHandler.h rename to GSWeb/GSWStaticResourceRequestHandler.h diff --git a/GSWeb.framework/GSWStaticResourceRequestHandler.m b/GSWeb/GSWStaticResourceRequestHandler.m similarity index 100% rename from GSWeb.framework/GSWStaticResourceRequestHandler.m rename to GSWeb/GSWStaticResourceRequestHandler.m diff --git a/GSWeb.framework/GSWStatisticsStore.h b/GSWeb/GSWStatisticsStore.h similarity index 100% rename from GSWeb.framework/GSWStatisticsStore.h rename to GSWeb/GSWStatisticsStore.h diff --git a/GSWeb.framework/GSWStatisticsStore.m b/GSWeb/GSWStatisticsStore.m similarity index 100% rename from GSWeb.framework/GSWStatisticsStore.m rename to GSWeb/GSWStatisticsStore.m diff --git a/GSWeb.framework/GSWStats.h b/GSWeb/GSWStats.h similarity index 100% rename from GSWeb.framework/GSWStats.h rename to GSWeb/GSWStats.h diff --git a/GSWeb.framework/GSWStats.m b/GSWeb/GSWStats.m similarity index 100% rename from GSWeb.framework/GSWStats.m rename to GSWeb/GSWStats.m diff --git a/GSWeb.framework/GSWString.h b/GSWeb/GSWString.h similarity index 100% rename from GSWeb.framework/GSWString.h rename to GSWeb/GSWString.h diff --git a/GSWeb.framework/GSWString.m b/GSWeb/GSWString.m similarity index 100% rename from GSWeb.framework/GSWString.m rename to GSWeb/GSWString.m diff --git a/GSWeb.framework/GSWSubmitButton.h b/GSWeb/GSWSubmitButton.h similarity index 100% rename from GSWeb.framework/GSWSubmitButton.h rename to GSWeb/GSWSubmitButton.h diff --git a/GSWeb.framework/GSWSubmitButton.m b/GSWeb/GSWSubmitButton.m similarity index 100% rename from GSWeb.framework/GSWSubmitButton.m rename to GSWeb/GSWSubmitButton.m diff --git a/GSWeb.framework/GSWSwitchComponent.h b/GSWeb/GSWSwitchComponent.h similarity index 100% rename from GSWeb.framework/GSWSwitchComponent.h rename to GSWeb/GSWSwitchComponent.h diff --git a/GSWeb.framework/GSWSwitchComponent.m b/GSWeb/GSWSwitchComponent.m similarity index 100% rename from GSWeb.framework/GSWSwitchComponent.m rename to GSWeb/GSWSwitchComponent.m diff --git a/GSWeb.framework/GSWTemplateParser.h b/GSWeb/GSWTemplateParser.h similarity index 100% rename from GSWeb.framework/GSWTemplateParser.h rename to GSWeb/GSWTemplateParser.h diff --git a/GSWeb.framework/GSWTemplateParser.m b/GSWeb/GSWTemplateParser.m similarity index 100% rename from GSWeb.framework/GSWTemplateParser.m rename to GSWeb/GSWTemplateParser.m diff --git a/GSWeb.framework/GSWTemporaryElement.h b/GSWeb/GSWTemporaryElement.h similarity index 100% rename from GSWeb.framework/GSWTemporaryElement.h rename to GSWeb/GSWTemporaryElement.h diff --git a/GSWeb.framework/GSWTemporaryElement.m b/GSWeb/GSWTemporaryElement.m similarity index 100% rename from GSWeb.framework/GSWTemporaryElement.m rename to GSWeb/GSWTemporaryElement.m diff --git a/GSWeb.framework/GSWText.h b/GSWeb/GSWText.h similarity index 100% rename from GSWeb.framework/GSWText.h rename to GSWeb/GSWText.h diff --git a/GSWeb.framework/GSWText.m b/GSWeb/GSWText.m similarity index 100% rename from GSWeb.framework/GSWText.m rename to GSWeb/GSWText.m diff --git a/GSWeb.framework/GSWTextField.h b/GSWeb/GSWTextField.h similarity index 100% rename from GSWeb.framework/GSWTextField.h rename to GSWeb/GSWTextField.h diff --git a/GSWeb.framework/GSWTextField.m b/GSWeb/GSWTextField.m similarity index 100% rename from GSWeb.framework/GSWTextField.m rename to GSWeb/GSWTextField.m diff --git a/GSWeb.framework/GSWToggle.h b/GSWeb/GSWToggle.h similarity index 100% rename from GSWeb.framework/GSWToggle.h rename to GSWeb/GSWToggle.h diff --git a/GSWeb.framework/GSWToggle.m b/GSWeb/GSWToggle.m similarity index 100% rename from GSWeb.framework/GSWToggle.m rename to GSWeb/GSWToggle.m diff --git a/GSWeb.framework/GSWTransactionRecord.h b/GSWeb/GSWTransactionRecord.h similarity index 100% rename from GSWeb.framework/GSWTransactionRecord.h rename to GSWeb/GSWTransactionRecord.h diff --git a/GSWeb.framework/GSWTransactionRecord.m b/GSWeb/GSWTransactionRecord.m similarity index 100% rename from GSWeb.framework/GSWTransactionRecord.m rename to GSWeb/GSWTransactionRecord.m diff --git a/GSWeb.framework/GSWURLValuedElementData.h b/GSWeb/GSWURLValuedElementData.h similarity index 100% rename from GSWeb.framework/GSWURLValuedElementData.h rename to GSWeb/GSWURLValuedElementData.h diff --git a/GSWeb.framework/GSWURLValuedElementData.m b/GSWeb/GSWURLValuedElementData.m similarity index 100% rename from GSWeb.framework/GSWURLValuedElementData.m rename to GSWeb/GSWURLValuedElementData.m diff --git a/GSWeb.framework/GSWUtils.h b/GSWeb/GSWUtils.h similarity index 100% rename from GSWeb.framework/GSWUtils.h rename to GSWeb/GSWUtils.h diff --git a/GSWeb.framework/GSWUtils.m b/GSWeb/GSWUtils.m similarity index 100% rename from GSWeb.framework/GSWUtils.m rename to GSWeb/GSWUtils.m diff --git a/GSWeb.framework/GSWVBScript.h b/GSWeb/GSWVBScript.h similarity index 100% rename from GSWeb.framework/GSWVBScript.h rename to GSWeb/GSWVBScript.h diff --git a/GSWeb.framework/GSWVBScript.m b/GSWeb/GSWVBScript.m similarity index 100% rename from GSWeb.framework/GSWVBScript.m rename to GSWeb/GSWVBScript.m diff --git a/GSWeb.framework/GSWWOCompatibility.h b/GSWeb/GSWWOCompatibility.h similarity index 100% rename from GSWeb.framework/GSWWOCompatibility.h rename to GSWeb/GSWWOCompatibility.h diff --git a/GSWeb.framework/GSWWorkerThread.h b/GSWeb/GSWWorkerThread.h similarity index 100% rename from GSWeb.framework/GSWWorkerThread.h rename to GSWeb/GSWWorkerThread.h diff --git a/GSWeb.framework/GSWWorkerThread.m b/GSWeb/GSWWorkerThread.m similarity index 100% rename from GSWeb.framework/GSWWorkerThread.m rename to GSWeb/GSWWorkerThread.m diff --git a/GSWeb.framework/GSWeb.h b/GSWeb/GSWeb.h similarity index 100% rename from GSWeb.framework/GSWeb.h rename to GSWeb/GSWeb.h diff --git a/GSWeb.framework/GSWeb.m b/GSWeb/GSWeb.m similarity index 100% rename from GSWeb.framework/GSWeb.m rename to GSWeb/GSWeb.m diff --git a/GSWeb.framework/Makefile.postamble b/GSWeb/Makefile.postamble similarity index 100% rename from GSWeb.framework/Makefile.postamble rename to GSWeb/Makefile.postamble diff --git a/GSWeb.framework/Makefile.preamble.in b/GSWeb/Makefile.preamble.in similarity index 100% rename from GSWeb.framework/Makefile.preamble.in rename to GSWeb/Makefile.preamble.in diff --git a/GSWeb.framework/NSData+Compress.h b/GSWeb/NSData+Compress.h similarity index 100% rename from GSWeb.framework/NSData+Compress.h rename to GSWeb/NSData+Compress.h diff --git a/GSWeb.framework/NSData+Compress.m b/GSWeb/NSData+Compress.m similarity index 100% rename from GSWeb.framework/NSData+Compress.m rename to GSWeb/NSData+Compress.m diff --git a/GSWeb.framework/NSDictionary+HTML.h b/GSWeb/NSDictionary+HTML.h similarity index 100% rename from GSWeb.framework/NSDictionary+HTML.h rename to GSWeb/NSDictionary+HTML.h diff --git a/GSWeb.framework/NSDictionary+HTML.m b/GSWeb/NSDictionary+HTML.m similarity index 100% rename from GSWeb.framework/NSDictionary+HTML.m rename to GSWeb/NSDictionary+HTML.m diff --git a/GSWeb.framework/NSNonBlockingFileHandle.h b/GSWeb/NSNonBlockingFileHandle.h similarity index 100% rename from GSWeb.framework/NSNonBlockingFileHandle.h rename to GSWeb/NSNonBlockingFileHandle.h diff --git a/GSWeb.framework/NSNonBlockingFileHandle.m b/GSWeb/NSNonBlockingFileHandle.m similarity index 100% rename from GSWeb.framework/NSNonBlockingFileHandle.m rename to GSWeb/NSNonBlockingFileHandle.m diff --git a/GSWeb.framework/NSObject+XML.h b/GSWeb/NSObject+XML.h similarity index 100% rename from GSWeb.framework/NSObject+XML.h rename to GSWeb/NSObject+XML.h diff --git a/GSWeb.framework/NSObject+XML.m b/GSWeb/NSObject+XML.m similarity index 100% rename from GSWeb.framework/NSObject+XML.m rename to GSWeb/NSObject+XML.m diff --git a/GSWeb.framework/NSString+HTML.h b/GSWeb/NSString+HTML.h similarity index 100% rename from GSWeb.framework/NSString+HTML.h rename to GSWeb/NSString+HTML.h diff --git a/GSWeb.framework/NSString+HTML.m b/GSWeb/NSString+HTML.m similarity index 100% rename from GSWeb.framework/NSString+HTML.m rename to GSWeb/NSString+HTML.m diff --git a/GSWeb.framework/NSString+Trimming.h b/GSWeb/NSString+Trimming.h similarity index 100% rename from GSWeb.framework/NSString+Trimming.h rename to GSWeb/NSString+Trimming.h diff --git a/GSWeb.framework/NSString+Trimming.m b/GSWeb/NSString+Trimming.m similarity index 100% rename from GSWeb.framework/NSString+Trimming.m rename to GSWeb/NSString+Trimming.m diff --git a/GSWeb.framework/Resources/MIME.plist b/GSWeb/Resources/MIME.plist similarity index 100% rename from GSWeb.framework/Resources/MIME.plist rename to GSWeb/Resources/MIME.plist diff --git a/GSWeb.framework/Resources/languages.plist b/GSWeb/Resources/languages.plist similarity index 100% rename from GSWeb.framework/Resources/languages.plist rename to GSWeb/Resources/languages.plist diff --git a/GSWeb.framework/WOKeyValueUnarchiver.h b/GSWeb/WOKeyValueUnarchiver.h similarity index 100% rename from GSWeb.framework/WOKeyValueUnarchiver.h rename to GSWeb/WOKeyValueUnarchiver.h diff --git a/GSWeb.framework/WOKeyValueUnarchiver.m b/GSWeb/WOKeyValueUnarchiver.m similarity index 100% rename from GSWeb.framework/WOKeyValueUnarchiver.m rename to GSWeb/WOKeyValueUnarchiver.m diff --git a/GSWeb.framework/WebObjects/WebObjects.h b/GSWeb/WebObjects/WebObjects.h similarity index 100% rename from GSWeb.framework/WebObjects/WebObjects.h rename to GSWeb/WebObjects/WebObjects.h diff --git a/GSWeb.framework/attach.h b/GSWeb/attach.h similarity index 100% rename from GSWeb.framework/attach.h rename to GSWeb/attach.h diff --git a/GSWeb.framework/attach.m b/GSWeb/attach.m similarity index 100% rename from GSWeb.framework/attach.m rename to GSWeb/attach.m diff --git a/GSWeb.framework/bundle-info.plist b/GSWeb/bundle-info.plist similarity index 100% rename from GSWeb.framework/bundle-info.plist rename to GSWeb/bundle-info.plist diff --git a/GSWeb.framework/gsweb.gsdoc b/GSWeb/gsweb.gsdoc similarity index 100% rename from GSWeb.framework/gsweb.gsdoc rename to GSWeb/gsweb.gsdoc diff --git a/GSWeb.framework/stacktrace.h b/GSWeb/stacktrace.h similarity index 100% rename from GSWeb.framework/stacktrace.h rename to GSWeb/stacktrace.h diff --git a/GSWeb.framework/stacktrace.m b/GSWeb/stacktrace.m similarity index 100% rename from GSWeb.framework/stacktrace.m rename to GSWeb/stacktrace.m