From c3983d45c603a56a95c835809d685ae993652ba3 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Thu, 26 Aug 2004 12:46:49 +0000
Subject: [PATCH] fixed an NGScripting dependency

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@60 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-appserver/NGObjWeb/ChangeLog                    |  5 +++++
 sope-appserver/NGObjWeb/GNUmakefile                  |  2 --
 .../NGObjWeb/Templates/WOComponentScript.m           |  1 -
 .../NGObjWeb/Templates/WOComponentScriptPart.m       |  9 ++++++---
 sope-appserver/NGObjWeb/Version                      |  2 +-
 sope-appserver/samples/WOxExtTest/TableView.wox      | 12 ++++++------
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 32eef602..1db2d7a6 100644
--- 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 75aa0c52..5d4a7fcc 100644
--- 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 6c75f3a7..83ef214f 100644
--- 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 8c96e5bf..25370635 100644
--- 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 9e39bed6..8a2dee4d 100644
--- 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 3c2c036c..6a235adc 100644
--- 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 ... -->
-- 
2.39.5