lookup libxmlSAXDriver bundles in Library/SaxDrivers/4.3/

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

diff --git a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m
index 3a18bfe43947973a49ee4c14ca23a56df06195ba..108c915913d781ce269d420a7148b80d16b57858 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m
+++ b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WOxElemBuilder.h>
 #include <DOM/EDOM.h>

diff --git a/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m
index 63737760ef9a1d63d797769c2d2e7394c4d32cf1..b86d0d0a71d6f839ce699c9a8725b907ce37fcf7 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m
+++ b/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m
@@ -162,6 +162,7 @@ static Class DateClass = Nil;
   if (defClasses == nil)
     defClasses = [[ud arrayForKey:@"WOxBuilderClasses"] copy];
   
+#warning TODO: remove that for SOPE 4.4! (use a fix bundle location)
   infos = [[NGBundleManager defaultBundleManager]
                             providedResourcesOfType:@"WOxElemBuilder"];
   if ([infos count] > 0) {

diff --git a/sope-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog
index f33c575341c52b41d7e06f02abfc859ef3142801..caba1533a9324ca3854368f1c72fa611246fedf9 100644 (file)
--- a/sope-ical/iCalSaxDriver/ChangeLog
+++ b/sope-ical/iCalSaxDriver/ChangeLog
@@ -1,6 +1,10 @@
+2004-08-24  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v4.3.11)
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
-       * fixed for SOPE 3.3 directory layout (v4.3.10)
+       * fixed for SOPE 4.3 directory layout (v4.3.10)
 
        * moved from sope-xml to sope-ical (v4.3.9)
 

diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile
index 048f8936051e5feabe90d3054f9053f055551322..03a32ac61c51606253ba58075468843facfbc851 100644 (file)
--- a/sope-ical/iCalSaxDriver/GNUmakefile
+++ b/sope-ical/iCalSaxDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = iCalSaxDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/
 
 iCalSaxDriver_OBJC_FILES = \
        ICalSaxParser.m         \

diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version
index 317960a726fc24e656b0d801367866c318018c26..c351558f441a4d159527ee99c46d76a467ff4349 100644 (file)
--- a/sope-ical/iCalSaxDriver/Version
+++ b/sope-ical/iCalSaxDriver/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=10
+SUBMINOR_VERSION:=11

diff --git a/sope-xml/STXSaxDriver/ChangeLog b/sope-xml/STXSaxDriver/ChangeLog
index 8fc2a365e3358d758e7a401a3521eaf8985f3806..41b8f2509218d12aaa999b8e46cd22dd3f4bddf3 100644 (file)
--- a/sope-xml/STXSaxDriver/ChangeLog
+++ b/sope-xml/STXSaxDriver/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-24  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v1.0.7)
+
 2004-05-05  Marcus Mueller  <znek@mulle-kybernetik.com>  
 
        * GNUmakefile.preamble, GNUmakefile.postamble: added support for

diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile
index ec3b553d2dc457190293a8a2e5a2162d2fb190bc..47f6c69604993758a802e613dd99f82ca20413f3 100644 (file)
--- a/sope-xml/STXSaxDriver/GNUmakefile
+++ b/sope-xml/STXSaxDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = STXSaxDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/
 
 STXSaxDriver_OBJC_FILES += \
        STXSaxDriver.m  \

diff --git a/sope-xml/STXSaxDriver/Version b/sope-xml/STXSaxDriver/Version
index 95c761ee03c31feed86fea0c0b89d755cd1fd7a8..72918f18aabe4e901a33c6e0d4d153721dc05bfc 100644 (file)
--- a/sope-xml/STXSaxDriver/Version
+++ b/sope-xml/STXSaxDriver/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=1
 MINOR_VERSION=0
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7

diff --git a/sope-xml/SaxObjC/ChangeLog b/sope-xml/SaxObjC/ChangeLog
index 6a88d7ee354799eeeea7cde6d115c37852655b34..8dcca0117db91b8ffb6a41840fe457bb3a0c9fda 100644 (file)
--- a/sope-xml/SaxObjC/ChangeLog
+++ b/sope-xml/SaxObjC/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-24  Helge Hess  <helge.hess@skyrix.com>
+
+       * SaxXMLReaderFactory.m: lookup SAX drivers in Library/SaxDrivers/4.3
+         (v4.3.39)
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * moved to SOPE 4.3 (v4.3.38)

diff --git a/sope-xml/SaxObjC/SaxXMLReaderFactory.m b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
index 90dd7b68dfc7f5977300b9a3ea16a12c573304fb..8a92e16ffdfd837224fbc1d4882157587166d583 100644 (file)
--- a/sope-xml/SaxObjC/SaxXMLReaderFactory.m
+++ b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
@@ -87,6 +87,7 @@ static id      factory       = nil;
       e = [tmp objectEnumerator];
       while ((tmp = [e nextObject])) {
         tmp = [tmp stringByAppendingPathComponent:@"SaxDrivers"];
+        tmp = [tmp stringByAppendingPathComponent:@"4.3"];
         if (![ma containsObject:tmp])
           [ma addObject:tmp];
       }
@@ -95,6 +96,7 @@ static id      factory       = nil;
   {
       NSBundle *fwBundle;
       
+      /* no need to add 4.3 here, right? */
       fwBundle = [NSBundle bundleForClass:[self class]];
       [ma addObject:[[fwBundle resourcePath]
                                stringByAppendingPathComponent:@"SaxDrivers"]];
@@ -111,7 +113,7 @@ static id      factory       = nil;
       
       e = [tmp objectEnumerator];
       while ((tmp = [e nextObject])) {
-        tmp = [tmp stringByAppendingPathComponent:@"Library/SaxDrivers"];
+        tmp = [tmp stringByAppendingPathComponent:@"Library/SaxDrivers/4.3"];
         if (![ma containsObject:tmp])
           [ma addObject:tmp];
       }

diff --git a/sope-xml/SaxObjC/Version b/sope-xml/SaxObjC/Version
index ab8bf848f4d70ede844cc2d80e407d526f49e3a8..760afe2d42040b34cb2f81900f7858995e07f5ee 100644 (file)
--- a/sope-xml/SaxObjC/Version
+++ b/sope-xml/SaxObjC/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=38
+SUBMINOR_VERSION:=39

diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog
index c5871ad6db49a597e2f4850210d56bc13027ec00..3800bf912a7ab155d78de690bb5fa1b09b0b7430 100644 (file)
--- a/sope-xml/libxmlSAXDriver/ChangeLog
+++ b/sope-xml/libxmlSAXDriver/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-24  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v4.3.14)
+
 2004-05-07  Helge Hess  <helge.hess@skyrix.com>
 
        * libxmlHTMLSAXDriver.m: do not report unclosed entity references

diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile
index a9101630ca5ed01b4d820f13cf5805c7e86e1a7a..294163021ce582cfb829283c6d9b08b8ba862065 100644 (file)
--- a/sope-xml/libxmlSAXDriver/GNUmakefile
+++ b/sope-xml/libxmlSAXDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = libxmlSAXDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/
 
 libxmlSAXDriver_OBJC_FILES = \
        libxmlSAXDriver.m       \

diff --git a/sope-xml/libxmlSAXDriver/Version b/sope-xml/libxmlSAXDriver/Version
index 92c8fa08c38f073a34665a077f87e34ece0ab9e3..cc039aca8fe720e89b35bf8bb715cdccb043159e 100644 (file)
--- a/sope-xml/libxmlSAXDriver/Version
+++ b/sope-xml/libxmlSAXDriver/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=13
+SUBMINOR_VERSION:=14

diff --git a/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m b/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
index c4799b429bf2b64a20f5b5622610c0c3a40a466b..6e049f69b03effda9ef7488e36c1968bb4511fa1 100644 (file)
--- a/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
+++ b/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: libxmlHTMLSAXDriver.m,v 1.5 2004/05/07 16:31:22 helge Exp $
 
 #import "libxmlHTMLSAXDriver.h"
 #import "libxmlSAXLocator.h"
@@ -58,6 +58,10 @@ static Class      NSStringClass = Nil;
 static const unsigned char *tagInvalidMsg = "tag %s invalid";
 static const unsigned char *unclosedEntityInvalidMsg = 
   "htmlParseEntityRef: expecting ';'";
+#if 0
+static const unsigned char *unexpectedNobrCloseMsg = 
+  "Unexpected end tag : %s";
+#endif
 
 static inline NSString *xmlCharsToString(const xmlChar *_s) {
   NSString *s;
@@ -711,9 +715,19 @@ static void error(void *udata, const char *msg, ...) {
   va_list           args;
   SaxParseException *e;
   
-  if (!reportInvalidTags && msg != NULL && toupper(msg[0]) == 'T') {
-    if (strncasecmp(tagInvalidMsg, msg, strlen(tagInvalidMsg)) == 0)
-      return;
+  if (!reportInvalidTags && msg != NULL) {
+    if (toupper(msg[0]) == 'T') {
+      if (strncasecmp(tagInvalidMsg, msg, strlen(tagInvalidMsg)) == 0)
+        return;
+    }
+#if 0
+    else if (toupper(msg[0]) == 'U') {
+      if (strncasecmp(unexpectedNobrCloseMsg, msg, 
+                      strlen(unexpectedNobrCloseMsg)) == 0)
+        return;
+      printf("MSG: '%s'\n", msg);
+    }
+#endif
   }
   if (!reportUnclosedEntities && msg != NULL && toupper(msg[0]) == 'H') {
     if (strncasecmp(unclosedEntityInvalidMsg, msg, 

diff --git a/sope-xml/pyxSAXDriver/ChangeLog b/sope-xml/pyxSAXDriver/ChangeLog
index 79dc1158d5f805024daaed010c0bb961a45eea24..98320cf4c026dd92cc35e2d040b9d86092bb2d6a 100644 (file)
--- a/sope-xml/pyxSAXDriver/ChangeLog
+++ b/sope-xml/pyxSAXDriver/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-24  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/
+
 2004-05-05  Marcus Mueller  <znek@mulle-kybernetik.com>  
 
        * GNUmakefile: added support for building with

diff --git a/sope-xml/pyxSAXDriver/GNUmakefile b/sope-xml/pyxSAXDriver/GNUmakefile
index 856c240ab1741efea43966010bb19f34196c3611..3bf8ee1c7c521e913a2206179d526e981137b3bb 100644 (file)
--- a/sope-xml/pyxSAXDriver/GNUmakefile
+++ b/sope-xml/pyxSAXDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = pyxSAXDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/Bundles
+BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SaxDrivers/4.3/
 
 pyxSAXDriver_OBJC_FILES = pyxSAXDriver.m