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 55035d781fae66ba696cf8a45f91f41135b8772c..8120142e995a2dc7b5a6cf8718dcda923b653b79 100644 (file)
--- 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 5d4a7fcc2ebd7fd6eece3c1878a49d6695078e0b..34fa78d9c05e731b46d135340d8cd47083d1bb6d 100644 (file)
--- 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 771a68e1c516bc9db1e113ce409fe663924675d5..28decc5cc9cb366e9585e983d21beabb6c0bcd5f 100644 (file)
--- 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 46ed12a99400a560cd962eeeefce362f947c9e1a..d0a1371410d5ca41fe468e98bad15d8ee23c677d 100644 (file)
--- 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 0f609cfb3ea51ddfe254b19600779291b4267f06..610acbde36953a4f4ddf59f2aaf88343cafaa7e2 100644 (file)
--- 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 c366e58319114470847586c2d81960ecad771c68..9b91bba08515db71901e6276a6aac425394a3baa 100644 (file)
--- 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 9a109b68c42f7da61c0cda99903bad47d9c49993..4a6e354a8da1ebd4e7a49d46ed7982ce458afb9e 100644 (file)
--- 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 395a354f17c955f0d31a8c767f9601a41e82ff68..e7cb6f74a97960ea951fe80e5e4ee645ea7f15b2 100644 (file)
--- 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 79c763a510fec5128f976d5ddac2aaa200515a3e..28bd0e3b6fe5d20701f5d17d5b890cd5816c613e 100644 (file)
--- 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>