From: helge Date: Mon, 23 Aug 2004 14:32:36 +0000 (+0000) Subject: moved NGXmlRpc out of NGObjWeb to an own project X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b84c75da546fd8bb5f997d9e9a9bace284458f22;p=sope moved NGXmlRpc out of NGObjWeb to an own project git-svn-id: http://svn.opengroupware.org/SOPE/trunk@40 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/GNUmakefile b/sope-appserver/GNUmakefile index 376c7830..5e6da56d 100644 --- a/sope-appserver/GNUmakefile +++ b/sope-appserver/GNUmakefile @@ -12,6 +12,7 @@ SUBPROJECTS += \ WOExtensions \ WOXML \ SoOFS \ + NGXmlRpc \ -include $(GNUSTEP_MAKEFILES)/GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 9f09b4d8..da1ef58d 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,7 @@ 2004-08-23 Helge Hess + * moved NGXmlRpc/xmlrpc_call to a separate project (v4.3.6) + * v4.3.5 * WOContext.m, WOComponent.m: modified component awake handling, should diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile index f0b048ac..af6bcb69 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile +++ b/sope-appserver/NGObjWeb/GNUmakefile @@ -20,7 +20,6 @@ libNGObjWeb_SUBPROJECTS = \ WOHttpAdaptor \ SoObjects \ WebDAV \ - NGXmlRpc \ libNGObjWeb_HEADER_FILES_DIR = NGObjWeb libNGObjWeb_HEADER_FILES_INSTALL_DIR = /NGObjWeb @@ -138,7 +137,7 @@ SoCore_PRINCIPAL_CLASS = SoCoreProduct # ----- NGObjWeb tools -TOOL_NAME = wod xmlrpc_call +TOOL_NAME = wod wod_OBJC_FILES += wod.m $(NGObjWebCore_OBJC_FILES) ifeq ($(FOUNDATION_LIB),gnu) @@ -146,8 +145,6 @@ wod_OBJC_FILES += UnixSignalHandler.m endif wod_SUBPROJECTS = Templates Associations -xmlrpc_call_OBJC_FILES = xmlrpc_call.m - -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/library.make include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index 1631d1c3..5832b6ce 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -59,13 +59,6 @@ wod_TOOL_LIBS += \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC -xmlrpc_call_LIB_DIRS += $(libNGObjWeb_LIB_DIRS) - -xmlrpc_call_TOOL_LIBS += \ - -lNGObjWeb -lNGScripting \ - -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC - # platform specific settings ifneq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3) diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble deleted file mode 100644 index fff5d556..00000000 --- a/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble +++ /dev/null @@ -1,13 +0,0 @@ -# $Id$ - -ADDITIONAL_CPPFLAGS += -pipe - -ADDITIONAL_CPPFLAGS += -pipe -Wall -ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1 - -NGXmlRpc_INCLUDE_DIRS += \ - -I.. -I. -I../.. \ - -I../../../sope-core \ - -I../../../sope-core/NGStreams \ - -I../../../sope-core/NGExtensions \ - -I../../../sope-xml diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 8c98006a..c4af3d32 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=4 +SUBMINOR_VERSION:=6 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m index 3a9832b3..fcacaa64 100644 --- a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m +++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: WOHttpTransaction.m 4 2004-08-20 17:04:31Z helge $ #include "WOHttpTransaction.h" #include "WORecordRequestStream.h" @@ -36,6 +35,11 @@ #include +@interface WORequest(UsedPrivates) +- (NSCalendarDate *)startDate; +- (id)startStatistics; +@end + int WOAsyncResponseStatus = 20001; NSString *WOAsyncResponseTokenKey = @"WOAsyncResponseToken"; NSString *WOAsyncResponseReadyNotificationName = diff --git a/sope-appserver/NGObjWeb/WOStatisticsStore.m b/sope-appserver/NGObjWeb/WOStatisticsStore.m index 48afd37a..57aeb8cd 100644 --- a/sope-appserver/NGObjWeb/WOStatisticsStore.m +++ b/sope-appserver/NGObjWeb/WOStatisticsStore.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: WOStatisticsStore.m 4 2004-08-20 17:04:31Z helge $ #include #include @@ -43,6 +42,11 @@ } @end +@interface WORequest(UsedPrivates) +- (NSCalendarDate *)startDate; +- (id)startStatistics; +@end + @implementation WOStatisticsStore static unsigned char *monthAbbr[13] = { diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog similarity index 98% rename from sope-appserver/NGObjWeb/NGXmlRpc/ChangeLog rename to sope-appserver/NGXmlRpc/ChangeLog index 8c11f51f..a88032d9 100644 --- a/sope-appserver/NGObjWeb/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,7 @@ +2004-08-23 Helge Hess + + * moved NGXmlRpc to own subproject (v4.3.1) + 2004-04-17 Marcus Mueller * WODirectAction+XmlRpc.m: replaced "catched" with "caught" in comment. diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/EONull+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/EONull+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/EOQualifier+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/EOQualifier+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile b/sope-appserver/NGXmlRpc/GNUmakefile similarity index 73% rename from sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile rename to sope-appserver/NGXmlRpc/GNUmakefile index 087aff73..abc4d23b 100644 --- a/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile +++ b/sope-appserver/NGXmlRpc/GNUmakefile @@ -1,13 +1,16 @@ -# $Id$ +# GNUstep makefile include $(GNUSTEP_MAKEFILES)/common.make +include ../Version +include ./Version -SUBPROJECT_NAME = NGXmlRpc +LIBRARY_NAME = libNGXmlRpc +TOOL_NAME = xmlrpc_call -NGXmlRpc_HEADER_FILES_DIR = . -NGXmlRpc_HEADER_FILES_INSTALL_DIR = /NGXmlRpc +libNGXmlRpc_HEADER_FILES_DIR = . +libNGXmlRpc_HEADER_FILES_INSTALL_DIR = /NGXmlRpc -NGXmlRpc_HEADER_FILES = \ +libNGXmlRpc_HEADER_FILES = \ NGAsyncResultProxy.h \ NGXmlRpc.h \ NGXmlRpcAction.h \ @@ -21,7 +24,7 @@ NGXmlRpc_HEADER_FILES = \ XmlRpcMethodCall+WO.h \ XmlRpcMethodResponse+WO.h \ -NGXmlRpc_OBJC_FILES = \ +libNGXmlRpc_OBJC_FILES = \ EOFetchSpecification+XmlRpcCoding.m \ EOKeyGlobalID+XmlRpcCoding.m \ EONull+XmlRpcCoding.m \ @@ -43,6 +46,10 @@ NGXmlRpc_OBJC_FILES = \ XmlRpcMethodResponse+WO.m \ NGXmlRpcAction+Registry.m \ + +xmlrpc_call_OBJC_FILES = xmlrpc_call.m + -include GNUmakefile.preamble -include $(GNUSTEP_MAKEFILES)/subproject.make +include $(GNUSTEP_MAKEFILES)/library.make +include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble new file mode 100644 index 00000000..7bffdf42 --- /dev/null +++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble @@ -0,0 +1,60 @@ +# $Id$ + +SOPE_ROOT=../.. +CORE_ROOT=$(SOPE_ROOT)/sope-core + +ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 +ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol + +ADDITIONAL_CPPFLAGS += -pipe -Wall +ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1 + +libNGXmlRpc_INCLUDE_DIRS += \ + -I.. -I. -I../.. \ + -I$(CORE_ROOT) \ + -I$(CORE_ROOT)/NGStreams \ + -I$(CORE_ROOT)/NGExtensions \ + -I$(SOPE_ROOT)/sope-xml + +libNGXmlRpc_LIBRARIES_DEPEND_UPON += \ + -lNGObjWeb -lNGScripting \ + -lNGMime -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC + +xmlrpc_call_TOOL_LIBS += \ + -lNGXmlRpc -lNGObjWeb -lNGScripting \ + -lNGMime -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC + +ifneq ($(GNUSTEP_BUILD_DIR),) +RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/.. +RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime +RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/$(CORE_ROOT) +RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml + +ADDITIONAL_LIB_DIRS += \ + -L$(GNUSTEP_OBJ_DIR) \ + -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_MIME)/NGMime/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME) + +else +ADDITIONAL_LIB_DIRS += \ + -L./$(GNUSTEP_OBJ_DIR) \ + -L../NGObjWeb/$(GNUSTEP_OBJ_DIR) \ + -L../NGScripting/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR) \ + -L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR) \ + -L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR) \ + -L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) +endif diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGAsyncResultProxy.h b/sope-appserver/NGXmlRpc/NGAsyncResultProxy.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGAsyncResultProxy.h rename to sope-appserver/NGXmlRpc/NGAsyncResultProxy.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGAsyncResultProxy.m b/sope-appserver/NGXmlRpc/NGAsyncResultProxy.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGAsyncResultProxy.m rename to sope-appserver/NGXmlRpc/NGAsyncResultProxy.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpc-Info.plist b/sope-appserver/NGXmlRpc/NGXmlRpc-Info.plist similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpc-Info.plist rename to sope-appserver/NGXmlRpc/NGXmlRpc-Info.plist diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpc.h b/sope-appserver/NGXmlRpc/NGXmlRpc.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpc.h rename to sope-appserver/NGXmlRpc/NGXmlRpc.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcAction+Registry.m b/sope-appserver/NGXmlRpc/NGXmlRpcAction+Registry.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcAction+Registry.m rename to sope-appserver/NGXmlRpc/NGXmlRpcAction+Registry.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcAction.h b/sope-appserver/NGXmlRpc/NGXmlRpcAction.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcAction.h rename to sope-appserver/NGXmlRpc/NGXmlRpcAction.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcAction.m b/sope-appserver/NGXmlRpc/NGXmlRpcAction.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcAction.m rename to sope-appserver/NGXmlRpc/NGXmlRpcAction.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.h b/sope-appserver/NGXmlRpc/NGXmlRpcClient.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.h rename to sope-appserver/NGXmlRpc/NGXmlRpcClient.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.m b/sope-appserver/NGXmlRpc/NGXmlRpcClient.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.m rename to sope-appserver/NGXmlRpc/NGXmlRpcClient.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcInvocation.h b/sope-appserver/NGXmlRpc/NGXmlRpcInvocation.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcInvocation.h rename to sope-appserver/NGXmlRpc/NGXmlRpcInvocation.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcInvocation.m b/sope-appserver/NGXmlRpc/NGXmlRpcInvocation.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcInvocation.m rename to sope-appserver/NGXmlRpc/NGXmlRpcInvocation.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcMethodSignature.h b/sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcMethodSignature.h rename to sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcMethodSignature.m b/sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcMethodSignature.m rename to sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcRequestHandler.h b/sope-appserver/NGXmlRpc/NGXmlRpcRequestHandler.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcRequestHandler.h rename to sope-appserver/NGXmlRpc/NGXmlRpcRequestHandler.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcRequestHandler.m b/sope-appserver/NGXmlRpc/NGXmlRpcRequestHandler.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcRequestHandler.m rename to sope-appserver/NGXmlRpc/NGXmlRpcRequestHandler.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NSObject+Reflection.h b/sope-appserver/NGXmlRpc/NSObject+Reflection.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NSObject+Reflection.h rename to sope-appserver/NGXmlRpc/NSObject+Reflection.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NSObject+Reflection.m b/sope-appserver/NGXmlRpc/NSObject+Reflection.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/NSObject+Reflection.m rename to sope-appserver/NGXmlRpc/NSObject+Reflection.m diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version new file mode 100644 index 00000000..93f90d16 --- /dev/null +++ b/sope-appserver/NGXmlRpc/Version @@ -0,0 +1,3 @@ +# version file + +SUBMINOR_VERSION:=1 diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpc.h b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpc.h rename to sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpc.m b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpc.m rename to sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpcIntrospection.h b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpcIntrospection.h rename to sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m rename to sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/WOMessage+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/WOMessage+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/WOMessage+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/WOMessage+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/WORequest+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/WORequest+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/WORequest+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/WORequest+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/WOResponse+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/WOResponse+XmlRpcCoding.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/WOResponse+XmlRpcCoding.m rename to sope-appserver/NGXmlRpc/WOResponse+XmlRpcCoding.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodCall+WO.h b/sope-appserver/NGXmlRpc/XmlRpcMethodCall+WO.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodCall+WO.h rename to sope-appserver/NGXmlRpc/XmlRpcMethodCall+WO.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodCall+WO.m b/sope-appserver/NGXmlRpc/XmlRpcMethodCall+WO.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodCall+WO.m rename to sope-appserver/NGXmlRpc/XmlRpcMethodCall+WO.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodResponse+WO.h b/sope-appserver/NGXmlRpc/XmlRpcMethodResponse+WO.h similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodResponse+WO.h rename to sope-appserver/NGXmlRpc/XmlRpcMethodResponse+WO.h diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodResponse+WO.m b/sope-appserver/NGXmlRpc/XmlRpcMethodResponse+WO.m similarity index 100% rename from sope-appserver/NGObjWeb/NGXmlRpc/XmlRpcMethodResponse+WO.m rename to sope-appserver/NGXmlRpc/XmlRpcMethodResponse+WO.m diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/common.h b/sope-appserver/NGXmlRpc/common.h similarity index 68% rename from sope-appserver/NGObjWeb/NGXmlRpc/common.h rename to sope-appserver/NGXmlRpc/common.h index 3c23c437..8bc83a4e 100644 --- a/sope-appserver/NGObjWeb/NGXmlRpc/common.h +++ b/sope-appserver/NGXmlRpc/common.h @@ -20,10 +20,20 @@ */ #import + +#if LIB_FOUNDATION_LIBRARY +# import +#elif NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY +# include +# include +#endif + #include -#include +#include + +#include +#include -@interface NSException(setUserInfo) -- (id)setReason:(NSString *)_reason; -- (id)setUserInfo:(NSDictionary *)_userInfo; +@interface NSObject(LastException) +- (NSException *)lastException; @end diff --git a/sope-appserver/NGObjWeb/xmlrpc_call.m b/sope-appserver/NGXmlRpc/xmlrpc_call.m similarity index 99% rename from sope-appserver/NGObjWeb/xmlrpc_call.m rename to sope-appserver/NGXmlRpc/xmlrpc_call.m index 8c283a51..235d18bf 100644 --- a/sope-appserver/NGObjWeb/xmlrpc_call.m +++ b/sope-appserver/NGXmlRpc/xmlrpc_call.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ /* xmlrpc_call @@ -32,7 +31,6 @@ */ #include -#include "common.h" #include #include @@ -42,6 +40,8 @@ # include "UnixSignalHandler.h" #endif +#include "common.h" + @class WOResponse; @interface NGXmlRpcClient(CallFailed) @@ -208,9 +208,6 @@ @end /* HandleCredentialsClient */ -#import -#include "common.h" - #define EXIT_FAIL -1 @implementation XmlRpcClient diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile index af55b35e..f8268f29 100644 --- a/sope-appserver/SoOFS/GNUmakefile +++ b/sope-appserver/SoOFS/GNUmakefile @@ -1,6 +1,8 @@ -# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $ +# GNUstep makefile include $(GNUSTEP_MAKEFILES)/common.make +include ../Version +include ./Version LIBRARY_NAME = libSoOFS