fixed an NGScripting dependency

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 32eef6020bde45ee6feba28ce5c7b003abfcf6c6..1db2d7a6eb3ed3e7ad5a708c94d947838a2fc917 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-26  Helge Hess  <helge.hess@skyrix.com>
+
+       * WOComponentScript.m, WOComponentScriptPart.m: removed dependency on
+         NGScripting (disables WOx scripting due to missing backend) (v4.3.15)
+
 2004-08-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.3.14

diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile
index 75aa0c52fda111308d1484da71237a94e8236bcf..5d4a7fcc2ebd7fd6eece3c1878a49d6695078e0b 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile
+++ b/sope-appserver/NGObjWeb/GNUmakefile
@@ -88,8 +88,6 @@ NGObjWebCore_OBJC_FILES = \
        _WOStringTable.m                \
         WOElementID.m                  \
 
-#      WOScriptedComponent.m           \
-
 libNGObjWeb_OBJC_FILES = \
        $(NGObjWebCore_OBJC_FILES)      \
        NGHttp+WO.m                     \

diff --git a/sope-appserver/NGObjWeb/Templates/WOComponentScript.m b/sope-appserver/NGObjWeb/Templates/WOComponentScript.m
index 6c75f3a764cc0375bf5d2879aef279d8fdafa304..83ef214fb772ecc358c0bfa0bd6bd743378b2070 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOComponentScript.m
+++ b/sope-appserver/NGObjWeb/Templates/WOComponentScript.m
@@ -22,7 +22,6 @@
 
 #include <NGObjWeb/WOTemplateBuilder.h>
 #include <NGObjWeb/WOComponent.h>
-#include <NGScripting/NSObject+Scripting.h>
 #include "common.h"
 
 @interface WOComponentScriptPart(UsedPrivates)

diff --git a/sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m b/sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m
index 8c96e5bfc79c6adad07b32936da4dfb63061fdc2..25370635d12b79e87399d7d06ab9ef4639598680 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m
+++ b/sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -22,7 +22,6 @@
 
 #include <NGObjWeb/WOTemplateBuilder.h>
 #include <NGObjWeb/WOComponent.h>
-#include <NGScripting/NSObject+Scripting.h>
 #include "common.h"
 
 @implementation WOComponentScriptPart
@@ -83,6 +82,9 @@
 }
 
 - (void)initScriptWithComponent:(WOComponent *)_object {
+#if 1
+  [self logWithFormat:@"ERROR: cannot apply script on object: %@", _object];
+#else
   /* fixed on JavaScript, part should have a language ... */
   NS_DURING {
     [_object evaluateScript:self->script language:@"javascript"
@@ -91,6 +93,7 @@
   NS_HANDLER
     [[self handleException:localException] raise];
   NS_ENDHANDLER;
+#endif
 }
 
 /* description */

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 9e39bed6f7a4a1125a137c7319097f5a0d989b2b..8a2dee4da303b87d7f4c07d77b71dfeeb408f1ad 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77

diff --git a/sope-appserver/samples/WOxExtTest/TableView.wox b/sope-appserver/samples/WOxExtTest/TableView.wox
index 3c2c036c8257f9980db648b489369f37345b774b..6a235adc32c6caacfa7833c6247e0a8e6eb9b18a 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/TableView.wox
+++ b/sope-appserver/samples/WOxExtTest/TableView.wox
@@ -1,11 +1,11 @@
 <?xml version='1.0' standalone='yes'?>
 <var:component
-           className="Frame" 
-           title="name"
-           xmlns="http://www.w3.org/1999/xhtml"
-           xmlns:var="http://www.skyrix.com/od/binding"
-           xmlns:const="http://www.skyrix.com/od/constant">
-
+  className="Frame" 
+  title="name"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+>
   <form var:action="self">
 
     <!-- in this case we need some 'subtags' for configuration ... -->