From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 27 Aug 2004 14:52:51 +0000 (+0000)
Subject: export WOComponentDefinition
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d9d5f55535cfd101d1149dbf06e001c9e14e9cc;p=sope

export WOComponentDefinition


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@68 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 55035d78..8120142e 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-27  Helge Hess  <helge.hess@skyrix.com>
+
+	* GNUmakefile: export WOComponentDefinition.h as a public header
+	  (v4.3.17)
+
 2004-08-26  Helge Hess  <helge.hess@skyrix.com>
 
 	* WOComponent: added ivar for clientObject, _without_ increasing class
diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile
index 5d4a7fcc..34fa78d9 100644
--- a/sope-appserver/NGObjWeb/GNUmakefile
+++ b/sope-appserver/NGObjWeb/GNUmakefile
@@ -30,41 +30,42 @@ libNGObjWeb_RESOURCES = \
 	DAVPropMap.plist	\
 
 libNGObjWeb_HEADER_FILES = \
-	NGObjWebDecls.h		\
-	NGObjWeb.h		\
-	OWResponder.h		\
-	OWViewRequestHandler.h	\
-	OWResourceManager.h	\
-	WEClientCapabilities.h	\
-	WOActionResults.h	\
-	WOAdaptor.h		\
-	WOApplication.h		\
-	WOCoreApplication.h	\
-	WOAssociation.h		\
-	WOComponent.h		\
-	WOContext.h		\
-	WOCookie.h		\
-	WODirectAction.h	\
-	WODisplayGroup.h	\
-	WODynamicElement.h	\
-	WOElement.h		\
-	WOHTTPConnection.h	\
-	WOMailDelivery.h	\
-	WOMessage.h		\
-	WORequest.h		\
-	WORequestHandler.h	\
-	WOResourceManager.h	\
-	WOResponse.h		\
-	WOSession.h		\
-	WOSessionStore.h	\
-	WOStatisticsStore.h	\
-	WOTemplateBuilder.h	\
-        WOxElemBuilder.h	\
-	WOTemplate.h		\
-	WOComponentScript.h	\
-	WOProxyRequestHandler.h	\
+	NGObjWebDecls.h			\
+	NGObjWeb.h			\
+	OWResponder.h			\
+	OWViewRequestHandler.h		\
+	OWResourceManager.h		\
+	WEClientCapabilities.h		\
+	WOActionResults.h		\
+	WOAdaptor.h			\
+	WOApplication.h			\
+	WOCoreApplication.h		\
+	WOAssociation.h			\
+	WOComponent.h			\
+	WOContext.h			\
+	WOCookie.h			\
+	WODirectAction.h		\
+	WODisplayGroup.h		\
+	WODynamicElement.h		\
+	WOElement.h			\
+	WOHTTPConnection.h		\
+	WOMailDelivery.h		\
+	WOMessage.h			\
+	WORequest.h			\
+	WORequestHandler.h		\
+	WOResourceManager.h		\
+	WOResponse.h			\
+	WOSession.h			\
+	WOSessionStore.h		\
+	WOStatisticsStore.h		\
+	WOTemplateBuilder.h		\
+        WOxElemBuilder.h		\
+	WOTemplate.h			\
+	WOComponentScript.h		\
+	WOProxyRequestHandler.h		\
 	WOPageGenerationContext.h	\
 	WOElementTrackingContext.h	\
+	WOComponentDefinition.h		\
 
 NGObjWebCore_OBJC_FILES = \
 	NSObject+WO.m			\
diff --git a/sope-appserver/NGObjWeb/WOComponentDefinition.h b/sope-appserver/NGObjWeb/NGObjWeb/WOComponentDefinition.h
similarity index 92%
rename from sope-appserver/NGObjWeb/WOComponentDefinition.h
rename to sope-appserver/NGObjWeb/NGObjWeb/WOComponentDefinition.h
index 771a68e1..28decc5c 100644
--- a/sope-appserver/NGObjWeb/WOComponentDefinition.h
+++ b/sope-appserver/NGObjWeb/NGObjWeb/WOComponentDefinition.h
@@ -31,8 +31,10 @@
 @class WOElement, WOComponent, WOResourceManager, WOTemplate;
 
 /*
-  Component definitions cache the contents of a .wo directory,
-  this is the HTML and wod files.
+  WOComponentDefinition
+  
+  Instances of this class are to WOComponents what Classes are to Objective-C
+  objects. They are the description and factory of components.
 */
 @interface WOComponentDefinition : NSObject
 {
diff --git a/sope-appserver/NGObjWeb/OWResourceManager.m b/sope-appserver/NGObjWeb/OWResourceManager.m
index 46ed12a9..d0a13714 100644
--- a/sope-appserver/NGObjWeb/OWResourceManager.m
+++ b/sope-appserver/NGObjWeb/OWResourceManager.m
@@ -25,7 +25,7 @@
 //            So: do not use that class, its DEPRECATED!
 
 #include <NGObjWeb/OWResourceManager.h>
-#include "WOComponentDefinition.h"
+#include <NGObjWeb/WOComponentDefinition.h>
 #include "WOComponent+private.h"
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOApplication.h>
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 0f609cfb..610acbde 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=16
+SUBMINOR_VERSION:=17
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77
diff --git a/sope-appserver/NGObjWeb/WOComponent.m b/sope-appserver/NGObjWeb/WOComponent.m
index c366e583..9b91bba0 100644
--- a/sope-appserver/NGObjWeb/WOComponent.m
+++ b/sope-appserver/NGObjWeb/WOComponent.m
@@ -25,7 +25,7 @@
 #include <NGObjWeb/WODynamicElement.h>
 #include "WOContext+private.h"
 #include "WOElement+private.h"
-#include "WOComponentDefinition.h"
+#include <NGObjWeb/WOComponentDefinition.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResponse.h>
diff --git a/sope-appserver/NGObjWeb/WOComponentDefinition.m b/sope-appserver/NGObjWeb/WOComponentDefinition.m
index 9a109b68..4a6e354a 100644
--- a/sope-appserver/NGObjWeb/WOComponentDefinition.m
+++ b/sope-appserver/NGObjWeb/WOComponentDefinition.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include "WOComponentDefinition.h"
+#include <NGObjWeb/WOComponentDefinition.h>
 #include "WOComponent+private.h"
 #include "WOComponentFault.h"
 #include <NGObjWeb/WOAssociation.h>
diff --git a/sope-appserver/NGObjWeb/WODynamicElement.m b/sope-appserver/NGObjWeb/WODynamicElement.m
index 395a354f..e7cb6f74 100644
--- a/sope-appserver/NGObjWeb/WODynamicElement.m
+++ b/sope-appserver/NGObjWeb/WODynamicElement.m
@@ -117,7 +117,7 @@ static Class FormElementClass = Nil;
   
   [self->otherTagString release];
 
-  if ((ea = self->extraAttributes) != nil) { // GC
+  if ((ea = self->extraAttributes) != NULL) { // GC
     register unsigned short i;
     
     [ea->extraString release];
diff --git a/sope-appserver/NGObjWeb/WOResourceManager.m b/sope-appserver/NGObjWeb/WOResourceManager.m
index 79c763a5..28bd0e3b 100644
--- a/sope-appserver/NGObjWeb/WOResourceManager.m
+++ b/sope-appserver/NGObjWeb/WOResourceManager.m
@@ -20,7 +20,7 @@
 */
 
 #include <NGObjWeb/WOResourceManager.h>
-#include "WOComponentDefinition.h"
+#include <NGObjWeb/WOComponentDefinition.h>
 #include "WOComponent+private.h"
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOApplication.h>