From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 8 Mar 2005 16:14:54 +0000 (+0000)
Subject: renamed common.h file in DynamicElements
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a54d81722008e907ac0ade86623c2f8625c18f48;p=sope

renamed common.h file in DynamicElements


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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index b467011f..8139b5c5 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-08  Helge Hess  <helge.hess@skyrix.com>
+
+	* DynamicElements/common.h, DynamicElements/*.m: renamed to decommon.h
+	  to avoid issues with Xcode, fixed broken compile due to missing
+	  header file (v4.5.133)
+
 2005-03-07  Helge Hess  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* DynamicElements/common.h: added missing #include's for
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m b/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m
index 97d49ae3..5d27367d 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 /*
   WOActionURL associations:
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOBody.m b/sope-appserver/NGObjWeb/DynamicElements/WOBody.m
index d3ba1f29..8bf43e3b 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOBody.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOBody.m
@@ -23,7 +23,7 @@
 #include "WOHTMLDynamicElement.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @class WOAssociation;
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
index 42806326..4261f6df 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOBrowser : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
index 70c7f17b..5510870f 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOCheckBox : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m
index 077f95fc..06c48a06 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOCheckBoxList : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m b/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m
index 0e228782..cebac548 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m
@@ -23,7 +23,7 @@
 #include "WOContext+private.h"
 #include <NGObjWeb/WOComponent.h>
 #include <NGObjWeb/WOResponse.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOContext(ComponentStackCount)
 - (unsigned)componentStackCount;
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m
index 23892345..bf8f5c26 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include "WOContext+private.h"
 #include "WOComponent+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOContext(ComponentStackCount)
 - (unsigned)componentStackCount;
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m b/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m
index 5c4eaca7..0b1a5634 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m
@@ -22,7 +22,7 @@
 #include "WOCompoundElement.h"
 #include "WOElement+private.h"
 #include <NGObjWeb/WOContext.h>
-#include "common.h"
+#include "decommon.h"
 
 #if APPLE_RUNTIME || NeXT_RUNTIME
 #  include <objc/objc-class.h>
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m b/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m
index 68753497..8264dfbf 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m
@@ -43,7 +43,7 @@
 
 #include <DOM/EDOM.h>
 #include <NGObjWeb/WOxElemBuilder.h>
-#include "common.h"
+#include "decommon.h"
 #include "WOElement+private.h"
 
 // TODO: make that a class cluster for improved performance
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m b/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m
index 4a24a336..26e6f035 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOEmbeddedObject : WOHTMLDynamicElement
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m b/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m
index 19e27285..4d699a01 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m
@@ -25,7 +25,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOxElemBuilder.h>
 #include <DOM/DOMProtocols.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOEntity : WOHTMLDynamicElement
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
index a0fd3dec..693eaf5d 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
@@ -35,7 +35,7 @@
 
 @end /* WOFileUpload */
 
-#include "common.h"
+#include "decommon.h"
 #include <NGMime/NGMime.h>
 #include <NGHttp/NGHttp.h>
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m
index e9e878aa..b4e18a48 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m
@@ -24,7 +24,7 @@
 #include "WOInput.h"
 #include "WOContext+private.h"
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOForm
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m b/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m
index 30ad7654..5cc90d0e 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m
@@ -24,7 +24,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WODynamicElement.h>
-#include "common.h"
+#include "decommon.h"
 
 #define FRAME_TYPE_None  0
 #define FRAME_TYPE_Page  1
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m b/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m
index fea0b521..39d99eef 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m
@@ -32,8 +32,8 @@
 
 @end
 
-#import "WOElement+private.h"
-#import "common.h"
+#include "WOElement+private.h"
+#include "decommon.h"
 
 // TODO(perf): ASCII Tags (appendContentCString)
 // TODO(perf): constant tags
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m
index 429efb01..290b025c 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m
@@ -21,7 +21,7 @@
 
 #include "WOGenericElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 #include <NGObjWeb/WOxElemBuilder.h>
 #include <DOM/DOMProtocols.h>
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m b/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m
index f425d011..ae8c0e72 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m
@@ -21,7 +21,7 @@
 
 #include "WOHTMLDynamicElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOHTMLDynamicElement
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m b/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m
index c4f8316e..f50b260b 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOHiddenField : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m b/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m
index b49c2c9b..81a11131 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m
@@ -35,7 +35,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOHtml
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m
index 0dcf6a71..dd851a0e 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m
@@ -26,7 +26,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGExtensions/NSString+Ext.h>
-#include "common.h"
+#include "decommon.h"
 
 #define PROFILE_CLUSTERS 0
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
index 1d61b692..696cae98 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
@@ -22,7 +22,7 @@
 #include "WOHyperlinkInfo.h"
 #include "WOElement+private.h"
 #include "WOHTMLDynamicElement.h"
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOHyperlinkInfo
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m b/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m
index 0ecba49c..4fe8168c 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m
@@ -24,7 +24,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WODynamicElement.h>
-#include "common.h"
+#include "decommon.h"
 
 #define FRAME_TYPE_None  0
 #define FRAME_TYPE_Page  1
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
index b483d8d9..7d81b4b9 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
@@ -53,7 +53,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 #if NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY
 @interface NSObject(Miss)
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m
index 77d25d3d..e28e3538 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m
@@ -52,7 +52,7 @@
 
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOImageButton
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOInput.m b/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
index c0198945..075d7449 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
@@ -21,7 +21,7 @@
 
 #include "WOInput.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOInput
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
index af5f5d70..16fa7982 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
@@ -37,7 +37,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOJavaScript
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m b/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m
index 83fa4c4b..206de0d6 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m
@@ -27,7 +27,7 @@
 #include <NGObjWeb/WOSession.h>
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOResponse.h>
-#include "common.h"
+#include "decommon.h"
 
 /*
   WOMetaRefresh associations:
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
index e3693776..b50a7a95 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
@@ -21,7 +21,7 @@
 
 #include "WOHTMLDynamicElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WONestedList : WOHTMLDynamicElement
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m b/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m
index f76d1976..76a23944 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOPasswordField : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
index 2f4c071e..664d2a0f 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
@@ -49,7 +49,7 @@
   inContext:(WOContext *)_ctx;
 @end
 
-#include "common.h"
+#include "decommon.h"
 
 #ifdef DEBUG
 static int profElements  = -1;
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m b/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m
index 4b64ab4f..ff2369f1 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 /*
   A QuickTime movie, picture, ...
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m b/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m
index b5b479c0..84282001 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WORadioButton : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m b/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m
index 8c8980c2..8cc254fd 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m
@@ -39,7 +39,7 @@
 
 @end /* WORadioButtonList */
 
-#include "common.h"
+#include "decommon.h"
 
 // TODO: add support for template? (does WO provide this?)
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
index f0f56c5f..2a9a9e62 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
@@ -22,7 +22,7 @@
 #include <NGObjWeb/WODynamicElement.h>
 #include "WOElement+private.h"
 #include <NGExtensions/NSString+misc.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WORepetition : WODynamicElement
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m
index e6cab87f..bb6522a9 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m
@@ -21,7 +21,7 @@
 
 #include "WOInput.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOResetButton : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m b/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m
index 2c4ce878..5b370e0b 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m
@@ -39,7 +39,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOResourceURL
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m b/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m
index 9752d43b..87dffee4 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m
@@ -33,7 +33,7 @@
 
 @end
 
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOSetCursor
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOString.m b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
index 4dbd5e89..f3ff6259 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOString.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
@@ -21,7 +21,7 @@
 
 #include "WOHTMLDynamicElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 #import <Foundation/NSNumberFormatter.h>
 #import <Foundation/NSDateFormatter.h>
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m
index 6314dd6c..05abea48 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m
@@ -21,7 +21,7 @@
 
 #include "WOInput.h"
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOSubmitButton : WOInput
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m
index 5b1cc3fa..8b18d5b6 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m
@@ -39,10 +39,10 @@
 #include <NGObjWeb/WOComponent.h>
 #include <NGObjWeb/WOAssociation.h>
 #include <NGObjWeb/WOContext.h>
-#import "WOElement+private.h"
-#import "WOContext+private.h"
-#import "WOComponent+private.h"
-#include "common.h"
+#include "WOElement+private.h"
+#include "WOContext+private.h"
+#include "WOComponent+private.h"
+#include "decommon.h"
 
 @implementation WOSwitchComponent
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOText.m b/sope-appserver/NGObjWeb/DynamicElements/WOText.m
index a74dff5c..fb761492 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOText.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOText.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 #import <Foundation/NSNumberFormatter.h>
 #import <Foundation/NSDateFormatter.h>
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m b/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m
index 72aad322..a4eb1530 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 #import <Foundation/NSNumberFormatter.h>
 #import <Foundation/NSDateFormatter.h>
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m
index 4058f886..88a57c87 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOVBScript : WOHTMLDynamicElement
 {
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
index 750496ea..4c456077 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
@@ -39,7 +39,7 @@
 @end
 
 #include <SaxObjC/XMLNamespaces.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOxControlElemBuilder
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m
index 23acf87c..2de3dc23 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m
@@ -61,7 +61,7 @@
 @end
 
 #include "WOCompoundElement.h"
-#include "common.h"
+#include "decommon.h"
 #include <SaxObjC/XMLNamespaces.h>
 
 @implementation WOxHTMLElemBuilder
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
index 1ad878e6..88c42a76 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
@@ -46,7 +46,7 @@
 @end
 
 #include <SaxObjC/XMLNamespaces.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOxMiscElemBuilder
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m
index 41a230a9..32a94383 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m
@@ -40,7 +40,7 @@
 
 @end
 
-#include "common.h"
+#include "decommon.h"
 #include <SaxObjC/XMLNamespaces.h>
 
 @implementation WOxXULElemBuilder
diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m
index df75e14d..5787a7e0 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m
@@ -45,7 +45,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOAssociation.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOCommonStaticDAHyperlink
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
index 2509c16e..058fee76 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
@@ -89,7 +89,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGExtensions/NSString+Ext.h>
-#include "common.h"
+#include "decommon.h"
 
 static Class NSURLClass = Nil;
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m b/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m
index 12da3b70..6803d14b 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m
@@ -30,7 +30,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOConstResourceImage
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m b/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m
index 18578c73..3ac12929 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m
@@ -31,7 +31,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOResourceImage
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m
index 3da8ea10..9ee6cc4d 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m
@@ -45,7 +45,7 @@
 #include "WOHyperlinkInfo.h"
 #include "WOElement+private.h"
 #include <NGObjWeb/WOAssociation.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOSimpleActionHyperlink
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m
index 8c761616..01d9fb29 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m
@@ -23,7 +23,7 @@
 #include "WOHyperlinkInfo.h"
 #include "WOCompoundElement.h"
 #include <NGObjWeb/WOAssociation.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOTemporaryHyperlink
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/common.h b/sope-appserver/NGObjWeb/DynamicElements/decommon.h
similarity index 94%
rename from sope-appserver/NGObjWeb/DynamicElements/common.h
rename to sope-appserver/NGObjWeb/DynamicElements/decommon.h
index 04df2efe..b365ef5c 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/common.h
+++ b/sope-appserver/NGObjWeb/DynamicElements/decommon.h
@@ -38,11 +38,11 @@
 
 #include <NGExtensions/NGExtensions.h>
 #include "WOResponse+private.h"
-#include "WOContext.h"
+#include <NGObjWeb/WOContext.h>
 
-static inline void WOResponse_AddEmptyCloseParens(WOResponse *r, WOContext *ctx) 
+static inline void WOResponse_AddEmptyCloseParens(WOResponse *r, WOContext *c) 
 {
-  if (ctx->wcFlags.xmlStyleEmptyElements) {
+  if (c->wcFlags.xmlStyleEmptyElements) {
     WOResponse_AddCString(r, " />");
   }
   else {
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 94604ec9..fba1773a 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=132
+SUBMINOR_VERSION:=133
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134