# HG changeset patch # User paulb # Date 1183825049 0 # Node ID 2cb1b18871170620aa92681d6e5dab138468357e # Parent 86dbdc42dee5607d7a870b92f72e29bfc812f305 [project @ 2007-07-07 16:17:24 by paulb] Relicensed under the LGPLv3 and upgraded Sarissa. diff -r 86dbdc42dee5 -r 2cb1b1887117 PKG-INFO --- a/PKG-INFO Sun Jun 10 22:52:12 2007 +0000 +++ b/PKG-INFO Sat Jul 07 16:17:29 2007 +0000 @@ -8,7 +8,7 @@ Home-page: http://www.boddie.org.uk/python/XSLTools.html Download-url: http://www.boddie.org.uk/python/downloads/XSLTools-0.4.6.tar.gz Summary: Modules and packages for the development of XML/XSL-based applications -License: LGPL +License: LGPL (version 3 or later) Description: XSLTools is a distribution providing modules and packages for the development of XML/XSL-based applications in Python, including Web-based applications, utilising the open source libxml2 and libxslt libraries through the libxml2dom diff -r 86dbdc42dee5 -r 2cb1b1887117 README.txt --- a/README.txt Sun Jun 10 22:52:12 2007 +0000 +++ b/README.txt Sat Jul 07 16:17:29 2007 +0000 @@ -49,6 +49,8 @@ * Improved the Login module, enabling the VerySimpleWithLogin example for various frameworks. + * Relicensed under the LGPL version 3 or later. + * Upgraded to Sarissa 0.9.7.8 (compatible with LGPL/GPL version 3). New in XSLTools 0.4.5 (Changes since XSLTools 0.4.4) ---------------------------------------------------- diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Constants.py --- a/XSLForms/Constants.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Constants.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ path_separator = "/" diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Fields.py --- a/XSLForms/Fields.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Fields.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,21 +5,20 @@ Interpretation of field collections from sources such as HTTP request parameter dictionaries. -Copyright (C) 2005 Paul Boddie +Copyright (C) 2005, 2006, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . -------- diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Output.py --- a/XSLForms/Output.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Output.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ import Constants diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Prepare.py --- a/XSLForms/Prepare.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Prepare.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005, 2006 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ from XSLTools import XSLOutput diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Resources/Common.py --- a/XSLForms/Resources/Common.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Resources/Common.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ import os diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Resources/Login.py --- a/XSLForms/Resources/Login.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Resources/Login.py Sat Jul 07 16:17:29 2007 +0000 @@ -7,20 +7,18 @@ Copyright (C) 2006, 2007 Paul Boddie -This software is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of -the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This software is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU General Public -License along with this library; see the file LICENCE.txt -If not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ from WebStack.Generic import ContentType, EndOfResponse diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Resources/PyQtCommon.py --- a/XSLForms/Resources/PyQtCommon.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Resources/PyQtCommon.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ import os diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Resources/PyQtResources.py --- a/XSLForms/Resources/PyQtResources.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Resources/PyQtResources.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ import XSLForms.Prepare diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Resources/PyQtWebResources.py --- a/XSLForms/Resources/PyQtWebResources.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Resources/PyQtWebResources.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ import XSLForms.Prepare diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Resources/WebResources.py --- a/XSLForms/Resources/WebResources.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Resources/WebResources.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005, 2006, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ import WebStack.Generic diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Resources/__init__.py --- a/XSLForms/Resources/__init__.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Resources/__init__.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ # vim: tabstop=4 expandtab shiftwidth=4 diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/Utils.py --- a/XSLForms/Utils.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/Utils.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ def add_elements(positions, *element_names): diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLForms/__init__.py --- a/XSLForms/__init__.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLForms/__init__.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005, 2006, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ __version__ = "0.4.6" diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLTools/XMLCalendar.py --- a/XSLTools/XMLCalendar.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLTools/XMLCalendar.py Sat Jul 07 16:17:29 2007 +0000 @@ -10,19 +10,18 @@ Copyright (c) 1995-2001 Corporation for National Research Initiatives. Copyright (c) 1991-1995 Stichting Mathematisch Centrum. -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ import libxml2dom diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLTools/XMLTable.py --- a/XSLTools/XMLTable.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLTools/XMLTable.py Sat Jul 07 16:17:29 2007 +0000 @@ -1,6 +1,23 @@ #!/usr/bin/env python -"A list of tuples to XML document converter." +""" +A list of tuples to XML document converter. + +Copyright (C) 2005 Paul Boddie + +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. + +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . +""" import libxml2dom from UserDict import UserDict diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLTools/XSLOutput.py --- a/XSLTools/XSLOutput.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLTools/XSLOutput.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005, 2006, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ # NOTE: Make this use other XSLT implementations, too. diff -r 86dbdc42dee5 -r 2cb1b1887117 XSLTools/__init__.py --- a/XSLTools/__init__.py Sun Jun 10 22:52:12 2007 +0000 +++ b/XSLTools/__init__.py Sat Jul 07 16:17:29 2007 +0000 @@ -5,19 +5,18 @@ Copyright (C) 2005, 2006, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . """ __version__ = "0.4.6" diff -r 86dbdc42dee5 -r 2cb1b1887117 docs/COPYING.txt --- a/docs/COPYING.txt Sun Jun 10 22:52:12 2007 +0000 +++ b/docs/COPYING.txt Sat Jul 07 16:17:29 2007 +0000 @@ -3,28 +3,28 @@ Copyright (C) 2005, 2006, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . Copyright and Licensing Information for Other Software ------------------------------------------------------ Certain examples in XSLTools use files from the Sarissa distribution (see http://sarissa.sourceforge.net). These files were made available under the GNU -Lesser General Public License and under the GNU General Public License; the -former licence is identical to that found in the LICENCE.txt file, whereas the -latter can be found in the LICENCE-Sarissa.txt file. +Lesser General Public License (version 2.1 or later) and under the GNU General +Public License (version 2 or later); the former licence is found in the +LICENCE-Sarissa-lgpl.txt file, whereas the latter is found in the +LICENCE-Sarissa-gpl.txt file. The XMLTools.XMLCalendar module uses a modified version of the monthcalendar function from the Python standard library's calendar module. This code was diff -r 86dbdc42dee5 -r 2cb1b1887117 docs/LICENCE-Sarissa-gpl.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/LICENCE-Sarissa-gpl.txt Sat Jul 07 16:17:29 2007 +0000 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -r 86dbdc42dee5 -r 2cb1b1887117 docs/LICENCE-Sarissa-lgpl.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/LICENCE-Sarissa-lgpl.txt Sat Jul 07 16:17:29 2007 +0000 @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library 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 Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff -r 86dbdc42dee5 -r 2cb1b1887117 docs/LICENCE-Sarissa.txt --- a/docs/LICENCE-Sarissa.txt Sun Jun 10 22:52:12 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,280 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS diff -r 86dbdc42dee5 -r 2cb1b1887117 docs/LICENCE.txt --- a/docs/LICENCE.txt Sun Jun 10 22:52:12 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,458 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff -r 86dbdc42dee5 -r 2cb1b1887117 docs/gpl-3.0.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/gpl-3.0.txt Sat Jul 07 16:17:29 2007 +0000 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff -r 86dbdc42dee5 -r 2cb1b1887117 docs/lgpl-3.0.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/lgpl-3.0.txt Sat Jul 07 16:17:29 2007 +0000 @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/Common/Configurator/Resources/scripts/sarissa.js --- a/examples/Common/Configurator/Resources/scripts/sarissa.js Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/Common/Configurator/Resources/scripts/sarissa.js Sat Jul 07 16:17:29 2007 +0000 @@ -2,72 +2,54 @@ * ==================================================================== * About * ==================================================================== - * Sarissa cross browser XML library - * @version 0.9.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. * The library supports Gecko based browsers like Mozilla and Firefox, - * Internet Explorer (5.5+ with MSXML3.0+) and, last but not least, KHTML based browsers like - * Konqueror and Safari. - * + * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net * ==================================================================== * Licence * ==================================================================== - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 or - * the GNU Lesser General Public License version 2.1 as published by - * the Free Software Foundation (your choice of the two). - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License or GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * or GNU Lesser General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * or visit http://www.gnu.org - * + * Sarissa is free software distributed under the GNU GPL version 2 (see gpl.txt) or higher, + * GNU LGPL version 2.1 (see lgpl.txt) or higher and Apache Software License 2.0 or higher + * (see asl.txt). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at http://www.gnu.org and + * http://www.apache.org. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /** - *

Sarissa is a utility class. Provides static methods for DOMDocument and - * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.

+ *

Sarissa is a utility class. Provides "static" methods for DOMDocument, + * DOM Node serialization to XML strings and other utility goodies.

* @constructor */ function Sarissa(){}; -/** @private */ +Sarissa.VERSION = "${project.version}"; Sarissa.PARSED_OK = "Document contains no parsing errors"; -/** - * Tells you whether transformNode and transformNodeToObject are available. This functionality - * is contained in sarissa_ieemu_xslt.js and is deprecated. If you want to control XSLT transformations - * use the XSLTProcessor - * @deprecated - * @type boolean - */ +Sarissa.PARSED_EMPTY = "Document is empty"; +Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; Sarissa.IS_ENABLED_TRANSFORM_NODE = false; -/** - * tells you whether XMLHttpRequest (or equivalent) is available - * @type boolean - */ -Sarissa.IS_ENABLED_XMLHTTP = false; -/** - * tells you whether selectNodes/selectSingleNode is available - * @type boolean - */ -Sarissa.IS_ENABLED_SELECT_NODES = false; var _sarissa_iNsCounter = 0; var _SARISSA_IEPREFIX4XSLPARAM = ""; var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; +if(!window.Node || !Node.ELEMENT_NODE){ + Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; +}; -if(!window.Node || !window.Node.ELEMENT_NODE){ - var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; -}; +if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } // IE initialization if(_SARISSA_IS_IE){ @@ -76,13 +58,15 @@ // used to store the most recent ProgID available out of the above var _SARISSA_DOM_PROGID = ""; var _SARISSA_XMLHTTP_PROGID = ""; + var _SARISSA_DOM_XMLWRITER = ""; /** * Called when the Sarissa_xx.js file is parsed, to pick most recent * ProgIDs for IE, then gets destroyed. + * @private * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled */ - pickRecentProgID = function (idList, enabledList){ + Sarissa.pickRecentProgID = function (idList){ // found progID flag var bFound = false; for(var i=0; i < idList.length && !bFound; i++){ @@ -90,50 +74,69 @@ var oDoc = new ActiveXObject(idList[i]); o2Store = idList[i]; bFound = true; - for(var j=0;j"); - // don't use the same prefix again - ++_sarissa_iNsCounter; - } - else - oDoc.loadXML("<" + sName + "/>"); + // create an artifical namespace prefix + // or reuse existing prefix if applicable + var prefix = ""; + if(sUri){ + if(sName.indexOf(":") > 1){ + prefix = sName.substring(0, sName.indexOf(":")); + sName = sName.substring(sName.indexOf(":")+1); + }else{ + prefix = "a" + (_sarissa_iNsCounter++); + }; + }; + // use namespaces if a namespace URI exists + if(sUri){ + oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); + } else { + oDoc.loadXML('<' + sName + " />"); + }; }; return oDoc; }; // see non-IE version Sarissa.getParseErrorText = function (oDoc) { var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ + if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode != 0){ parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + "\nLocation: " + oDoc.parseError.url + "\nLine Number " + oDoc.parseError.line + ", Column " + @@ -144,6 +147,9 @@ parseErrorText += "-"; }; parseErrorText += "^\n"; + } + else if(oDoc.documentElement == null){ + parseErrorText = Sarissa.PARSED_EMPTY; }; return parseErrorText; }; @@ -158,43 +164,109 @@ * @constructor */ XSLTProcessor = function(){ + if(!_SARISSA_XSLTEMPLATE_PROGID){ + _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); + }; this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); this.processor = null; }; /** - * Impoprts the given XSLT DOM and compiles it to a reusable transform + * Imports the given XSLT DOM and compiles it to a reusable transform + * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those * @argument xslDoc The XSLT DOMDocument to import */ XSLTProcessor.prototype.importStylesheet = function(xslDoc){ + if(!_SARISSA_THREADEDDOM_PROGID){ + _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); + }; + xslDoc.setProperty("SelectionLanguage", "XPath"); + xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); - converted.loadXML(xslDoc.xml); + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + // make included/imported stylesheets work if exist and xsl was originally loaded from url + if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ + converted.async = false; + if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { + converted.setProperty("AllowDocumentFunction", true); + converted.resolveExternals = true; + } + converted.load(xslDoc.url); + } else { + converted.loadXML(xslDoc.xml); + }; + converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + var output = converted.selectSingleNode("//xsl:output"); + this.outputMethod = output ? output.getAttribute("method") : "html"; this.template.stylesheet = converted; this.processor = this.template.createProcessor(); - // (re)set default param values + // for getParameter and clearParameters this.paramsSet = new Array(); }; + /** - * Transform the given XML DOM + * Transform the given XML DOM and return the transformation result as a new DOM document * @argument sourceDoc The XML DOMDocument to transform * @return The transformation result as a DOM Document */ XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ - this.processor.input = sourceDoc; - var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output = outDoc; - this.processor.transform(); - return outDoc; + // fix for bug 1549749 + if(_SARISSA_THREADEDDOM_PROGID){ + this.processor.input=sourceDoc; + var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); + this.processor.output=outDoc; + this.processor.transform(); + return outDoc; + } + else{ + if(!_SARISSA_DOM_XMLWRITER){ + _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); + }; + this.processor.input = sourceDoc; + var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); + this.processor.output = outDoc; + this.processor.transform(); + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + oDoc.loadXML(outDoc.output+""); + return oDoc; + }; }; + /** - * Not sure if this works in IE. Maybe this will allow non-well-formed - * transformation results (i.e. with no single root element) + * Transform the given XML DOM and return the transformation result as a new DOM fragment. + * Note: The xsl:output method must match the nature of the owner document (XML/HTML). * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Fragment + * @argument ownerDoc The owner of the result fragment + * @return The transformation result as a DOM Document */ - XSLTProcessor.prototype.transformToFragment = function(sourceDoc, ownerDocument){ - return this.transformToDocument(sourceDoc); + XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { + this.processor.input = sourceDoc; + this.processor.transform(); + var s = this.processor.output; + var f = ownerDoc.createDocumentFragment(); + if (this.outputMethod == 'text') { + f.appendChild(ownerDoc.createTextNode(s)); + } else if (ownerDoc.body && ownerDoc.body.innerHTML) { + var container = ownerDoc.createElement('div'); + container.innerHTML = s; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + else { + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + if (s.substring(0, 5) == '') + 2); + } + var xml = ''.concat('', s, ''); + oDoc.loadXML(xml); + var container = oDoc.documentElement; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + return f; }; + /** * Set global XSLT parameter of the imported stylesheet * @argument nsURI The parameter namespace URI @@ -202,13 +274,15 @@ * @argument value The new parameter value */ XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ - /* nsURI is optional but cannot be null */ + // make value a zero length string if null to allow clearing + value = value ? value : ""; + // nsURI is optional but cannot be null if(nsURI){ this.processor.addParameter(name, value, nsURI); }else{ this.processor.addParameter(name, value); }; - /* update updated params for getParameter */ + // update updated params for getParameter if(!this.paramsSet[""+nsURI]){ this.paramsSet[""+nsURI] = new Array(); }; @@ -222,102 +296,38 @@ * @return The parameter value if reviously set by setParameter, null otherwise */ XSLTProcessor.prototype.getParameter = function(nsURI, name){ - if(this.paramsSet[""+nsURI] && this.paramsSet[""+nsURI][name]) - return this.paramsSet[""+nsURI][name]; - else + nsURI = "" + nsURI; + if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ + return this.paramsSet[nsURI][name]; + }else{ return null; + }; }; -} -else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - if(window.XMLDocument){ - /** - *

Emulate IE's onreadystatechange attribute

- */ - XMLDocument.prototype.onreadystatechange = null; - /** - *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

- *
  • 1 == LOADING,
    • - *
  • 2 == LOADED,
    • - *
  • 3 == INTERACTIVE,
    • - *
  • 4 == COMPLETED
- */ - XMLDocument.prototype.readyState = 0; - /** - *

Emulate IE's parseError attribute

- */ - XMLDocument.prototype.parseError = 0; - - // NOTE: setting async to false will only work with documents - // called over HTTP (meaning a server), not the local file system, - // unless you are using Moz 1.4+. - // BTW the try>catch block is for 1.4; I haven't found a way to check if - // the property is implemented without - // causing an error and I dont want to use user agent stuff for that... - var _SARISSA_SYNC_NON_IMPLEMENTED = false; - try{ - /** - *

Emulates IE's async property for Moz versions prior to 1.4. - * It controls whether loading of remote XML files works - * synchronously or asynchronously.

- */ - XMLDocument.prototype.async = true; - _SARISSA_SYNC_NON_IMPLEMENTED = true; - }catch(e){/* trap */}; - /** - *

Keeps a handle to the original load() method. Internal use and only - * if Mozilla version is lower than 1.4

- * @private - */ - XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; - - /** - *

Overrides the original load method to provide synchronous loading for - * Mozilla versions prior to 1.4, using an XMLHttpRequest object (if - * async is set to false)

- * @returns the DOM Object as it was before the load() call (may be empty) - */ - XMLDocument.prototype.load = function(sURI) { - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - this.parseError = 0; - Sarissa.__setReadyState__(this, 1); - try { - if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sURI, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, this); - Sarissa.__setReadyState__(this, 3); - } - else { - this._sarissa_load(sURI); - }; - } - catch (objException) { - this.parseError = -1; - } - finally { - if(this.async == false){ - Sarissa.__handleLoad__(this); - }; + /** + * Clear parameters (set them to default values as defined in the stylesheet itself) + */ + XSLTProcessor.prototype.clearParameters = function(){ + for(var nsURI in this.paramsSet){ + for(var name in this.paramsSet[nsURI]){ + if(nsURI){ + this.processor.addParameter(name, "", nsURI); + }else{ + this.processor.addParameter(name, ""); }; - return oDoc; }; - };//if(window.XMLDocument) - + }; + this.paramsSet = new Array(); + }; +}else{ /* end IE initialization, try to deal with real browsers now ;-) */ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ /** *

Ensures the document was loaded correctly, otherwise sets the * parseError to -1 to indicate something went wrong. Internal use

* @private */ Sarissa.__handleLoad__ = function(oDoc){ - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") - oDoc.parseError = -1; Sarissa.__setReadyState__(oDoc, 4); }; - /** *

Attached by an event handler to the load event. Internal use.

* @private @@ -325,7 +335,6 @@ _sarissa_XMLDocument_onload = function(){ Sarissa.__handleLoad__(this); }; - /** *

Sets the readyState property of the given DOM Document object. * Internal use.

@@ -336,80 +345,129 @@ */ Sarissa.__setReadyState__ = function(oDoc, iReadyState){ oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") oDoc.onreadystatechange(); }; - /** - *

Factory method to obtain a new DOM Document object

- * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + *

Emulate IE's onreadystatechange attribute

+ */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

+ *
  • 1 == LOADING,
    • + *
  • 2 == LOADED,
    • + *
  • 3 == INTERACTIVE,
    • + *
  • 4 == COMPLETED
+ */ + oDoc.readyState = 0; + }; oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); return oDoc; - }; + }; + if(window.XMLDocument){ + // do nothing + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ + //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good + /** + *

Factory method to obtain a new DOM Document object

+ * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + return oDoc; + }; + }; };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) }; //========================================== // Common stuff //========================================== if(!window.DOMParser){ - /** - * DOMParser is a utility class, used to construct DOMDocuments from XML strings - * @constructor - */ - DOMParser = function() { + if(_SARISSA_IS_SAFARI){ + /* + * DOMParser is a utility class, used to construct DOMDocuments from XML strings + * @constructor + */ + DOMParser = function() { }; + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ + DOMParser = function() { }; + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; - }; - }; -if(window.XMLHttpRequest){ - Sarissa.IS_ENABLED_XMLHTTP = true; -} -else if(_SARISSA_IS_IE){ - /** - * Emulate XMLHttpRequest - * @constructor - */ - XMLHttpRequest = function() { - return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); - }; - Sarissa.IS_ENABLED_XMLHTTP = true; -}; - -if(!window.document.importNode && _SARISSA_IS_IE){ +if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ try{ /** - * Implements importNode for the current window document in IE using innerHTML. - * Testing showed that DOM was multiple times slower than innerHTML for this, - * sorry folks. If you encounter trouble (who knows what IE does behind innerHTML) - * please gimme a call. + * Implementation of importNode for the context window document in IE. + * If oNode is a TextNode, bChildren is ignored. * @param oNode the Node to import * @param bChildren whether to include the children of oNode * @returns the imported node for further use */ - window.document.importNode = function(oNode, bChildren){ - var importNode = document.createElement("div"); - if(bChildren) - importNode.innerHTML = Sarissa.serialize(oNode); - else - importNode.innerHTML = Sarissa.serialize(oNode.cloneNode(false)); - return importNode.firstChild; + document.importNode = function(oNode, bChildren){ + var tmp; + if (oNode.nodeName=='#text') { + return document.createTextElement(oNode.data); + } + else { + if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ + tmp = document.createElement("table"); + } + else if(oNode.nodeName == "td"){ + tmp = document.createElement("tr"); + } + else if(oNode.nodeName == "option"){ + tmp = document.createElement("select"); + } + else{ + tmp = document.createElement("div"); + }; + if(bChildren){ + tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; + }else{ + tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; + }; + return tmp.getElementsByTagName("*")[0]; + }; + }; - }catch(e){}; + }catch(e){ }; }; if(!Sarissa.getParseErrorText){ /** @@ -423,17 +481,16 @@ */ Sarissa.getParseErrorText = function (oDoc){ var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ - /*moz*/ - if(oDoc.documentElement.tagName == "parsererror"){ - parseErrorText = oDoc.documentElement.firstChild.data; - parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; - }/*konq*/ - else if(oDoc.documentElement.tagName == "html"){ - parseErrorText = Sarissa.getText(oDoc.documentElement.getElementsByTagName("h1")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false); - }; + if(!oDoc.documentElement){ + parseErrorText = Sarissa.PARSED_EMPTY; + } else if(oDoc.documentElement.tagName == "parsererror"){ + parseErrorText = oDoc.documentElement.firstChild.data; + parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; + } else if(oDoc.getElementsByTagName("parsererror").length > 0){ + var parsererror = oDoc.getElementsByTagName("parsererror")[0]; + parseErrorText = Sarissa.getText(parsererror, true)+"\n"; + } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ + parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; }; return parseErrorText; }; @@ -446,8 +503,7 @@ var nodeType = node.nodeType; if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ s += node.data; - } - else if(deep == true + } else if(deep == true && (nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ @@ -456,33 +512,20 @@ }; return s; }; -if(window.XMLSerializer){ +if(!window.XMLSerializer + && Sarissa.getDomDocument + && Sarissa.getDomDocument("","foo", null).xml){ /** - *

Factory method to obtain the serialization of a DOM Node

- * @returns the serialized Node as an XML string + * Utility class to serialize DOM Node objects to XML strings + * @constructor */ - Sarissa.serialize = function(oDoc){ - return (new XMLSerializer()).serializeToString(oDoc); - }; -}else{ - if((Sarissa.getDomDocument("","foo", null)).xml){ - // see non-IE version - Sarissa.serialize = function(oDoc) { - // TODO: check for HTML document and return innerHTML instead - return oDoc.xml; - }; - /** - * Utility class to serialize DOM Node objects to XML strings - * @constructor - */ - XMLSerializer = function(){}; - /** - * Serialize the given DOM Node to an XML string - * @param oNode the DOM Node to serialize - */ - XMLSerializer.prototype.serializeToString = function(oNode) { - return oNode.xml; - }; + XMLSerializer = function(){}; + /** + * Serialize the given DOM Node to an XML string + * @param oNode the DOM Node to serialize + */ + XMLSerializer.prototype.serializeToString = function(oNode) { + return oNode.xml; }; }; @@ -497,7 +540,8 @@ * @argument oNode the Node to empty */ Sarissa.clearChildNodes = function(oNode) { - while(oNode.hasChildNodes()){ + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild) { oNode.removeChild(oNode.firstChild); }; }; @@ -510,17 +554,19 @@ * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false */ Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; var nodes = nodeFrom.childNodes; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { + if(typeof(ownerDoc.importNode) != "undefined") { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); }; - } - else{ + } else { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(nodes[i].cloneNode(true)); }; @@ -533,32 +579,34 @@ * the move operation, unless you supply a true third parameter

* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; - var nodes = nodeFrom.childNodes; // if within the same doc, just move, else copy and delete if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - nodeTo.appendChild(nodes[i]); - }else{ + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; + } else { var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } - else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; }; Sarissa.clearChildNodes(nodeFrom); }; - }; /** diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/Common/Dictionary/Resources/scripts/sarissa.js --- a/examples/Common/Dictionary/Resources/scripts/sarissa.js Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/Common/Dictionary/Resources/scripts/sarissa.js Sat Jul 07 16:17:29 2007 +0000 @@ -2,72 +2,54 @@ * ==================================================================== * About * ==================================================================== - * Sarissa cross browser XML library - * @version 0.9.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. * The library supports Gecko based browsers like Mozilla and Firefox, - * Internet Explorer (5.5+ with MSXML3.0+) and, last but not least, KHTML based browsers like - * Konqueror and Safari. - * + * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net * ==================================================================== * Licence * ==================================================================== - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 or - * the GNU Lesser General Public License version 2.1 as published by - * the Free Software Foundation (your choice of the two). - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License or GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * or GNU Lesser General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * or visit http://www.gnu.org - * + * Sarissa is free software distributed under the GNU GPL version 2 (see gpl.txt) or higher, + * GNU LGPL version 2.1 (see lgpl.txt) or higher and Apache Software License 2.0 or higher + * (see asl.txt). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at http://www.gnu.org and + * http://www.apache.org. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /** - *

Sarissa is a utility class. Provides static methods for DOMDocument and - * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.

+ *

Sarissa is a utility class. Provides "static" methods for DOMDocument, + * DOM Node serialization to XML strings and other utility goodies.

* @constructor */ function Sarissa(){}; -/** @private */ +Sarissa.VERSION = "${project.version}"; Sarissa.PARSED_OK = "Document contains no parsing errors"; -/** - * Tells you whether transformNode and transformNodeToObject are available. This functionality - * is contained in sarissa_ieemu_xslt.js and is deprecated. If you want to control XSLT transformations - * use the XSLTProcessor - * @deprecated - * @type boolean - */ +Sarissa.PARSED_EMPTY = "Document is empty"; +Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; Sarissa.IS_ENABLED_TRANSFORM_NODE = false; -/** - * tells you whether XMLHttpRequest (or equivalent) is available - * @type boolean - */ -Sarissa.IS_ENABLED_XMLHTTP = false; -/** - * tells you whether selectNodes/selectSingleNode is available - * @type boolean - */ -Sarissa.IS_ENABLED_SELECT_NODES = false; var _sarissa_iNsCounter = 0; var _SARISSA_IEPREFIX4XSLPARAM = ""; var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; +if(!window.Node || !Node.ELEMENT_NODE){ + Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; +}; -if(!window.Node || !window.Node.ELEMENT_NODE){ - var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; -}; +if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } // IE initialization if(_SARISSA_IS_IE){ @@ -76,13 +58,15 @@ // used to store the most recent ProgID available out of the above var _SARISSA_DOM_PROGID = ""; var _SARISSA_XMLHTTP_PROGID = ""; + var _SARISSA_DOM_XMLWRITER = ""; /** * Called when the Sarissa_xx.js file is parsed, to pick most recent * ProgIDs for IE, then gets destroyed. + * @private * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled */ - pickRecentProgID = function (idList, enabledList){ + Sarissa.pickRecentProgID = function (idList){ // found progID flag var bFound = false; for(var i=0; i < idList.length && !bFound; i++){ @@ -90,50 +74,69 @@ var oDoc = new ActiveXObject(idList[i]); o2Store = idList[i]; bFound = true; - for(var j=0;j"); - // don't use the same prefix again - ++_sarissa_iNsCounter; - } - else - oDoc.loadXML("<" + sName + "/>"); + // create an artifical namespace prefix + // or reuse existing prefix if applicable + var prefix = ""; + if(sUri){ + if(sName.indexOf(":") > 1){ + prefix = sName.substring(0, sName.indexOf(":")); + sName = sName.substring(sName.indexOf(":")+1); + }else{ + prefix = "a" + (_sarissa_iNsCounter++); + }; + }; + // use namespaces if a namespace URI exists + if(sUri){ + oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); + } else { + oDoc.loadXML('<' + sName + " />"); + }; }; return oDoc; }; // see non-IE version Sarissa.getParseErrorText = function (oDoc) { var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ + if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode != 0){ parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + "\nLocation: " + oDoc.parseError.url + "\nLine Number " + oDoc.parseError.line + ", Column " + @@ -144,6 +147,9 @@ parseErrorText += "-"; }; parseErrorText += "^\n"; + } + else if(oDoc.documentElement == null){ + parseErrorText = Sarissa.PARSED_EMPTY; }; return parseErrorText; }; @@ -158,43 +164,109 @@ * @constructor */ XSLTProcessor = function(){ + if(!_SARISSA_XSLTEMPLATE_PROGID){ + _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); + }; this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); this.processor = null; }; /** - * Impoprts the given XSLT DOM and compiles it to a reusable transform + * Imports the given XSLT DOM and compiles it to a reusable transform + * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those * @argument xslDoc The XSLT DOMDocument to import */ XSLTProcessor.prototype.importStylesheet = function(xslDoc){ + if(!_SARISSA_THREADEDDOM_PROGID){ + _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); + }; + xslDoc.setProperty("SelectionLanguage", "XPath"); + xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); - converted.loadXML(xslDoc.xml); + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + // make included/imported stylesheets work if exist and xsl was originally loaded from url + if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ + converted.async = false; + if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { + converted.setProperty("AllowDocumentFunction", true); + converted.resolveExternals = true; + } + converted.load(xslDoc.url); + } else { + converted.loadXML(xslDoc.xml); + }; + converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + var output = converted.selectSingleNode("//xsl:output"); + this.outputMethod = output ? output.getAttribute("method") : "html"; this.template.stylesheet = converted; this.processor = this.template.createProcessor(); - // (re)set default param values + // for getParameter and clearParameters this.paramsSet = new Array(); }; + /** - * Transform the given XML DOM + * Transform the given XML DOM and return the transformation result as a new DOM document * @argument sourceDoc The XML DOMDocument to transform * @return The transformation result as a DOM Document */ XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ - this.processor.input = sourceDoc; - var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output = outDoc; - this.processor.transform(); - return outDoc; + // fix for bug 1549749 + if(_SARISSA_THREADEDDOM_PROGID){ + this.processor.input=sourceDoc; + var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); + this.processor.output=outDoc; + this.processor.transform(); + return outDoc; + } + else{ + if(!_SARISSA_DOM_XMLWRITER){ + _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); + }; + this.processor.input = sourceDoc; + var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); + this.processor.output = outDoc; + this.processor.transform(); + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + oDoc.loadXML(outDoc.output+""); + return oDoc; + }; }; + /** - * Not sure if this works in IE. Maybe this will allow non-well-formed - * transformation results (i.e. with no single root element) + * Transform the given XML DOM and return the transformation result as a new DOM fragment. + * Note: The xsl:output method must match the nature of the owner document (XML/HTML). * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Fragment + * @argument ownerDoc The owner of the result fragment + * @return The transformation result as a DOM Document */ - XSLTProcessor.prototype.transformToFragment = function(sourceDoc, ownerDocument){ - return this.transformToDocument(sourceDoc); + XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { + this.processor.input = sourceDoc; + this.processor.transform(); + var s = this.processor.output; + var f = ownerDoc.createDocumentFragment(); + if (this.outputMethod == 'text') { + f.appendChild(ownerDoc.createTextNode(s)); + } else if (ownerDoc.body && ownerDoc.body.innerHTML) { + var container = ownerDoc.createElement('div'); + container.innerHTML = s; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + else { + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + if (s.substring(0, 5) == '') + 2); + } + var xml = ''.concat('', s, ''); + oDoc.loadXML(xml); + var container = oDoc.documentElement; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + return f; }; + /** * Set global XSLT parameter of the imported stylesheet * @argument nsURI The parameter namespace URI @@ -202,13 +274,15 @@ * @argument value The new parameter value */ XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ - /* nsURI is optional but cannot be null */ + // make value a zero length string if null to allow clearing + value = value ? value : ""; + // nsURI is optional but cannot be null if(nsURI){ this.processor.addParameter(name, value, nsURI); }else{ this.processor.addParameter(name, value); }; - /* update updated params for getParameter */ + // update updated params for getParameter if(!this.paramsSet[""+nsURI]){ this.paramsSet[""+nsURI] = new Array(); }; @@ -222,102 +296,38 @@ * @return The parameter value if reviously set by setParameter, null otherwise */ XSLTProcessor.prototype.getParameter = function(nsURI, name){ - if(this.paramsSet[""+nsURI] && this.paramsSet[""+nsURI][name]) - return this.paramsSet[""+nsURI][name]; - else + nsURI = "" + nsURI; + if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ + return this.paramsSet[nsURI][name]; + }else{ return null; + }; }; -} -else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - if(window.XMLDocument){ - /** - *

Emulate IE's onreadystatechange attribute

- */ - XMLDocument.prototype.onreadystatechange = null; - /** - *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

- *
  • 1 == LOADING,
    • - *
  • 2 == LOADED,
    • - *
  • 3 == INTERACTIVE,
    • - *
  • 4 == COMPLETED
- */ - XMLDocument.prototype.readyState = 0; - /** - *

Emulate IE's parseError attribute

- */ - XMLDocument.prototype.parseError = 0; - - // NOTE: setting async to false will only work with documents - // called over HTTP (meaning a server), not the local file system, - // unless you are using Moz 1.4+. - // BTW the try>catch block is for 1.4; I haven't found a way to check if - // the property is implemented without - // causing an error and I dont want to use user agent stuff for that... - var _SARISSA_SYNC_NON_IMPLEMENTED = false; - try{ - /** - *

Emulates IE's async property for Moz versions prior to 1.4. - * It controls whether loading of remote XML files works - * synchronously or asynchronously.

- */ - XMLDocument.prototype.async = true; - _SARISSA_SYNC_NON_IMPLEMENTED = true; - }catch(e){/* trap */}; - /** - *

Keeps a handle to the original load() method. Internal use and only - * if Mozilla version is lower than 1.4

- * @private - */ - XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; - - /** - *

Overrides the original load method to provide synchronous loading for - * Mozilla versions prior to 1.4, using an XMLHttpRequest object (if - * async is set to false)

- * @returns the DOM Object as it was before the load() call (may be empty) - */ - XMLDocument.prototype.load = function(sURI) { - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - this.parseError = 0; - Sarissa.__setReadyState__(this, 1); - try { - if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sURI, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, this); - Sarissa.__setReadyState__(this, 3); - } - else { - this._sarissa_load(sURI); - }; - } - catch (objException) { - this.parseError = -1; - } - finally { - if(this.async == false){ - Sarissa.__handleLoad__(this); - }; + /** + * Clear parameters (set them to default values as defined in the stylesheet itself) + */ + XSLTProcessor.prototype.clearParameters = function(){ + for(var nsURI in this.paramsSet){ + for(var name in this.paramsSet[nsURI]){ + if(nsURI){ + this.processor.addParameter(name, "", nsURI); + }else{ + this.processor.addParameter(name, ""); }; - return oDoc; }; - };//if(window.XMLDocument) - + }; + this.paramsSet = new Array(); + }; +}else{ /* end IE initialization, try to deal with real browsers now ;-) */ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ /** *

Ensures the document was loaded correctly, otherwise sets the * parseError to -1 to indicate something went wrong. Internal use

* @private */ Sarissa.__handleLoad__ = function(oDoc){ - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") - oDoc.parseError = -1; Sarissa.__setReadyState__(oDoc, 4); }; - /** *

Attached by an event handler to the load event. Internal use.

* @private @@ -325,7 +335,6 @@ _sarissa_XMLDocument_onload = function(){ Sarissa.__handleLoad__(this); }; - /** *

Sets the readyState property of the given DOM Document object. * Internal use.

@@ -336,80 +345,129 @@ */ Sarissa.__setReadyState__ = function(oDoc, iReadyState){ oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") oDoc.onreadystatechange(); }; - /** - *

Factory method to obtain a new DOM Document object

- * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + *

Emulate IE's onreadystatechange attribute

+ */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

+ *
  • 1 == LOADING,
    • + *
  • 2 == LOADED,
    • + *
  • 3 == INTERACTIVE,
    • + *
  • 4 == COMPLETED
+ */ + oDoc.readyState = 0; + }; oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); return oDoc; - }; + }; + if(window.XMLDocument){ + // do nothing + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ + //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good + /** + *

Factory method to obtain a new DOM Document object

+ * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + return oDoc; + }; + }; };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) }; //========================================== // Common stuff //========================================== if(!window.DOMParser){ - /** - * DOMParser is a utility class, used to construct DOMDocuments from XML strings - * @constructor - */ - DOMParser = function() { + if(_SARISSA_IS_SAFARI){ + /* + * DOMParser is a utility class, used to construct DOMDocuments from XML strings + * @constructor + */ + DOMParser = function() { }; + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ + DOMParser = function() { }; + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; - }; - }; -if(window.XMLHttpRequest){ - Sarissa.IS_ENABLED_XMLHTTP = true; -} -else if(_SARISSA_IS_IE){ - /** - * Emulate XMLHttpRequest - * @constructor - */ - XMLHttpRequest = function() { - return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); - }; - Sarissa.IS_ENABLED_XMLHTTP = true; -}; - -if(!window.document.importNode && _SARISSA_IS_IE){ +if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ try{ /** - * Implements importNode for the current window document in IE using innerHTML. - * Testing showed that DOM was multiple times slower than innerHTML for this, - * sorry folks. If you encounter trouble (who knows what IE does behind innerHTML) - * please gimme a call. + * Implementation of importNode for the context window document in IE. + * If oNode is a TextNode, bChildren is ignored. * @param oNode the Node to import * @param bChildren whether to include the children of oNode * @returns the imported node for further use */ - window.document.importNode = function(oNode, bChildren){ - var importNode = document.createElement("div"); - if(bChildren) - importNode.innerHTML = Sarissa.serialize(oNode); - else - importNode.innerHTML = Sarissa.serialize(oNode.cloneNode(false)); - return importNode.firstChild; + document.importNode = function(oNode, bChildren){ + var tmp; + if (oNode.nodeName=='#text') { + return document.createTextElement(oNode.data); + } + else { + if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ + tmp = document.createElement("table"); + } + else if(oNode.nodeName == "td"){ + tmp = document.createElement("tr"); + } + else if(oNode.nodeName == "option"){ + tmp = document.createElement("select"); + } + else{ + tmp = document.createElement("div"); + }; + if(bChildren){ + tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; + }else{ + tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; + }; + return tmp.getElementsByTagName("*")[0]; + }; + }; - }catch(e){}; + }catch(e){ }; }; if(!Sarissa.getParseErrorText){ /** @@ -423,17 +481,16 @@ */ Sarissa.getParseErrorText = function (oDoc){ var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ - /*moz*/ - if(oDoc.documentElement.tagName == "parsererror"){ - parseErrorText = oDoc.documentElement.firstChild.data; - parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; - }/*konq*/ - else if(oDoc.documentElement.tagName == "html"){ - parseErrorText = Sarissa.getText(oDoc.documentElement.getElementsByTagName("h1")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false); - }; + if(!oDoc.documentElement){ + parseErrorText = Sarissa.PARSED_EMPTY; + } else if(oDoc.documentElement.tagName == "parsererror"){ + parseErrorText = oDoc.documentElement.firstChild.data; + parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; + } else if(oDoc.getElementsByTagName("parsererror").length > 0){ + var parsererror = oDoc.getElementsByTagName("parsererror")[0]; + parseErrorText = Sarissa.getText(parsererror, true)+"\n"; + } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ + parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; }; return parseErrorText; }; @@ -446,8 +503,7 @@ var nodeType = node.nodeType; if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ s += node.data; - } - else if(deep == true + } else if(deep == true && (nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ @@ -456,33 +512,20 @@ }; return s; }; -if(window.XMLSerializer){ +if(!window.XMLSerializer + && Sarissa.getDomDocument + && Sarissa.getDomDocument("","foo", null).xml){ /** - *

Factory method to obtain the serialization of a DOM Node

- * @returns the serialized Node as an XML string + * Utility class to serialize DOM Node objects to XML strings + * @constructor */ - Sarissa.serialize = function(oDoc){ - return (new XMLSerializer()).serializeToString(oDoc); - }; -}else{ - if((Sarissa.getDomDocument("","foo", null)).xml){ - // see non-IE version - Sarissa.serialize = function(oDoc) { - // TODO: check for HTML document and return innerHTML instead - return oDoc.xml; - }; - /** - * Utility class to serialize DOM Node objects to XML strings - * @constructor - */ - XMLSerializer = function(){}; - /** - * Serialize the given DOM Node to an XML string - * @param oNode the DOM Node to serialize - */ - XMLSerializer.prototype.serializeToString = function(oNode) { - return oNode.xml; - }; + XMLSerializer = function(){}; + /** + * Serialize the given DOM Node to an XML string + * @param oNode the DOM Node to serialize + */ + XMLSerializer.prototype.serializeToString = function(oNode) { + return oNode.xml; }; }; @@ -497,7 +540,8 @@ * @argument oNode the Node to empty */ Sarissa.clearChildNodes = function(oNode) { - while(oNode.hasChildNodes()){ + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild) { oNode.removeChild(oNode.firstChild); }; }; @@ -510,17 +554,19 @@ * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false */ Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; var nodes = nodeFrom.childNodes; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { + if(typeof(ownerDoc.importNode) != "undefined") { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); }; - } - else{ + } else { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(nodes[i].cloneNode(true)); }; @@ -533,32 +579,34 @@ * the move operation, unless you supply a true third parameter

* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; - var nodes = nodeFrom.childNodes; // if within the same doc, just move, else copy and delete if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - nodeTo.appendChild(nodes[i]); - }else{ + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; + } else { var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } - else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; }; Sarissa.clearChildNodes(nodeFrom); }; - }; /** diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/Common/PEP241/Resources/scripts/sarissa.js --- a/examples/Common/PEP241/Resources/scripts/sarissa.js Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/Common/PEP241/Resources/scripts/sarissa.js Sat Jul 07 16:17:29 2007 +0000 @@ -2,72 +2,54 @@ * ==================================================================== * About * ==================================================================== - * Sarissa cross browser XML library - * @version 0.9.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. * The library supports Gecko based browsers like Mozilla and Firefox, - * Internet Explorer (5.5+ with MSXML3.0+) and, last but not least, KHTML based browsers like - * Konqueror and Safari. - * + * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net * ==================================================================== * Licence * ==================================================================== - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 or - * the GNU Lesser General Public License version 2.1 as published by - * the Free Software Foundation (your choice of the two). - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License or GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * or GNU Lesser General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * or visit http://www.gnu.org - * + * Sarissa is free software distributed under the GNU GPL version 2 (see gpl.txt) or higher, + * GNU LGPL version 2.1 (see lgpl.txt) or higher and Apache Software License 2.0 or higher + * (see asl.txt). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at http://www.gnu.org and + * http://www.apache.org. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /** - *

Sarissa is a utility class. Provides static methods for DOMDocument and - * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.

+ *

Sarissa is a utility class. Provides "static" methods for DOMDocument, + * DOM Node serialization to XML strings and other utility goodies.

* @constructor */ function Sarissa(){}; -/** @private */ +Sarissa.VERSION = "${project.version}"; Sarissa.PARSED_OK = "Document contains no parsing errors"; -/** - * Tells you whether transformNode and transformNodeToObject are available. This functionality - * is contained in sarissa_ieemu_xslt.js and is deprecated. If you want to control XSLT transformations - * use the XSLTProcessor - * @deprecated - * @type boolean - */ +Sarissa.PARSED_EMPTY = "Document is empty"; +Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; Sarissa.IS_ENABLED_TRANSFORM_NODE = false; -/** - * tells you whether XMLHttpRequest (or equivalent) is available - * @type boolean - */ -Sarissa.IS_ENABLED_XMLHTTP = false; -/** - * tells you whether selectNodes/selectSingleNode is available - * @type boolean - */ -Sarissa.IS_ENABLED_SELECT_NODES = false; var _sarissa_iNsCounter = 0; var _SARISSA_IEPREFIX4XSLPARAM = ""; var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; +if(!window.Node || !Node.ELEMENT_NODE){ + Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; +}; -if(!window.Node || !window.Node.ELEMENT_NODE){ - var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; -}; +if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } // IE initialization if(_SARISSA_IS_IE){ @@ -76,13 +58,15 @@ // used to store the most recent ProgID available out of the above var _SARISSA_DOM_PROGID = ""; var _SARISSA_XMLHTTP_PROGID = ""; + var _SARISSA_DOM_XMLWRITER = ""; /** * Called when the Sarissa_xx.js file is parsed, to pick most recent * ProgIDs for IE, then gets destroyed. + * @private * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled */ - pickRecentProgID = function (idList, enabledList){ + Sarissa.pickRecentProgID = function (idList){ // found progID flag var bFound = false; for(var i=0; i < idList.length && !bFound; i++){ @@ -90,50 +74,69 @@ var oDoc = new ActiveXObject(idList[i]); o2Store = idList[i]; bFound = true; - for(var j=0;j"); - // don't use the same prefix again - ++_sarissa_iNsCounter; - } - else - oDoc.loadXML("<" + sName + "/>"); + // create an artifical namespace prefix + // or reuse existing prefix if applicable + var prefix = ""; + if(sUri){ + if(sName.indexOf(":") > 1){ + prefix = sName.substring(0, sName.indexOf(":")); + sName = sName.substring(sName.indexOf(":")+1); + }else{ + prefix = "a" + (_sarissa_iNsCounter++); + }; + }; + // use namespaces if a namespace URI exists + if(sUri){ + oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); + } else { + oDoc.loadXML('<' + sName + " />"); + }; }; return oDoc; }; // see non-IE version Sarissa.getParseErrorText = function (oDoc) { var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ + if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode != 0){ parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + "\nLocation: " + oDoc.parseError.url + "\nLine Number " + oDoc.parseError.line + ", Column " + @@ -144,6 +147,9 @@ parseErrorText += "-"; }; parseErrorText += "^\n"; + } + else if(oDoc.documentElement == null){ + parseErrorText = Sarissa.PARSED_EMPTY; }; return parseErrorText; }; @@ -158,43 +164,109 @@ * @constructor */ XSLTProcessor = function(){ + if(!_SARISSA_XSLTEMPLATE_PROGID){ + _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); + }; this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); this.processor = null; }; /** - * Impoprts the given XSLT DOM and compiles it to a reusable transform + * Imports the given XSLT DOM and compiles it to a reusable transform + * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those * @argument xslDoc The XSLT DOMDocument to import */ XSLTProcessor.prototype.importStylesheet = function(xslDoc){ + if(!_SARISSA_THREADEDDOM_PROGID){ + _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); + }; + xslDoc.setProperty("SelectionLanguage", "XPath"); + xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); - converted.loadXML(xslDoc.xml); + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + // make included/imported stylesheets work if exist and xsl was originally loaded from url + if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ + converted.async = false; + if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { + converted.setProperty("AllowDocumentFunction", true); + converted.resolveExternals = true; + } + converted.load(xslDoc.url); + } else { + converted.loadXML(xslDoc.xml); + }; + converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + var output = converted.selectSingleNode("//xsl:output"); + this.outputMethod = output ? output.getAttribute("method") : "html"; this.template.stylesheet = converted; this.processor = this.template.createProcessor(); - // (re)set default param values + // for getParameter and clearParameters this.paramsSet = new Array(); }; + /** - * Transform the given XML DOM + * Transform the given XML DOM and return the transformation result as a new DOM document * @argument sourceDoc The XML DOMDocument to transform * @return The transformation result as a DOM Document */ XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ - this.processor.input = sourceDoc; - var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output = outDoc; - this.processor.transform(); - return outDoc; + // fix for bug 1549749 + if(_SARISSA_THREADEDDOM_PROGID){ + this.processor.input=sourceDoc; + var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); + this.processor.output=outDoc; + this.processor.transform(); + return outDoc; + } + else{ + if(!_SARISSA_DOM_XMLWRITER){ + _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); + }; + this.processor.input = sourceDoc; + var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); + this.processor.output = outDoc; + this.processor.transform(); + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + oDoc.loadXML(outDoc.output+""); + return oDoc; + }; }; + /** - * Not sure if this works in IE. Maybe this will allow non-well-formed - * transformation results (i.e. with no single root element) + * Transform the given XML DOM and return the transformation result as a new DOM fragment. + * Note: The xsl:output method must match the nature of the owner document (XML/HTML). * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Fragment + * @argument ownerDoc The owner of the result fragment + * @return The transformation result as a DOM Document */ - XSLTProcessor.prototype.transformToFragment = function(sourceDoc, ownerDocument){ - return this.transformToDocument(sourceDoc); + XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { + this.processor.input = sourceDoc; + this.processor.transform(); + var s = this.processor.output; + var f = ownerDoc.createDocumentFragment(); + if (this.outputMethod == 'text') { + f.appendChild(ownerDoc.createTextNode(s)); + } else if (ownerDoc.body && ownerDoc.body.innerHTML) { + var container = ownerDoc.createElement('div'); + container.innerHTML = s; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + else { + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + if (s.substring(0, 5) == '') + 2); + } + var xml = ''.concat('', s, ''); + oDoc.loadXML(xml); + var container = oDoc.documentElement; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + return f; }; + /** * Set global XSLT parameter of the imported stylesheet * @argument nsURI The parameter namespace URI @@ -202,13 +274,15 @@ * @argument value The new parameter value */ XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ - /* nsURI is optional but cannot be null */ + // make value a zero length string if null to allow clearing + value = value ? value : ""; + // nsURI is optional but cannot be null if(nsURI){ this.processor.addParameter(name, value, nsURI); }else{ this.processor.addParameter(name, value); }; - /* update updated params for getParameter */ + // update updated params for getParameter if(!this.paramsSet[""+nsURI]){ this.paramsSet[""+nsURI] = new Array(); }; @@ -222,102 +296,38 @@ * @return The parameter value if reviously set by setParameter, null otherwise */ XSLTProcessor.prototype.getParameter = function(nsURI, name){ - if(this.paramsSet[""+nsURI] && this.paramsSet[""+nsURI][name]) - return this.paramsSet[""+nsURI][name]; - else + nsURI = "" + nsURI; + if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ + return this.paramsSet[nsURI][name]; + }else{ return null; + }; }; -} -else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - if(window.XMLDocument){ - /** - *

Emulate IE's onreadystatechange attribute

- */ - XMLDocument.prototype.onreadystatechange = null; - /** - *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

- *
  • 1 == LOADING,
    • - *
  • 2 == LOADED,
    • - *
  • 3 == INTERACTIVE,
    • - *
  • 4 == COMPLETED
- */ - XMLDocument.prototype.readyState = 0; - /** - *

Emulate IE's parseError attribute

- */ - XMLDocument.prototype.parseError = 0; - - // NOTE: setting async to false will only work with documents - // called over HTTP (meaning a server), not the local file system, - // unless you are using Moz 1.4+. - // BTW the try>catch block is for 1.4; I haven't found a way to check if - // the property is implemented without - // causing an error and I dont want to use user agent stuff for that... - var _SARISSA_SYNC_NON_IMPLEMENTED = false; - try{ - /** - *

Emulates IE's async property for Moz versions prior to 1.4. - * It controls whether loading of remote XML files works - * synchronously or asynchronously.

- */ - XMLDocument.prototype.async = true; - _SARISSA_SYNC_NON_IMPLEMENTED = true; - }catch(e){/* trap */}; - /** - *

Keeps a handle to the original load() method. Internal use and only - * if Mozilla version is lower than 1.4

- * @private - */ - XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; - - /** - *

Overrides the original load method to provide synchronous loading for - * Mozilla versions prior to 1.4, using an XMLHttpRequest object (if - * async is set to false)

- * @returns the DOM Object as it was before the load() call (may be empty) - */ - XMLDocument.prototype.load = function(sURI) { - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - this.parseError = 0; - Sarissa.__setReadyState__(this, 1); - try { - if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sURI, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, this); - Sarissa.__setReadyState__(this, 3); - } - else { - this._sarissa_load(sURI); - }; - } - catch (objException) { - this.parseError = -1; - } - finally { - if(this.async == false){ - Sarissa.__handleLoad__(this); - }; + /** + * Clear parameters (set them to default values as defined in the stylesheet itself) + */ + XSLTProcessor.prototype.clearParameters = function(){ + for(var nsURI in this.paramsSet){ + for(var name in this.paramsSet[nsURI]){ + if(nsURI){ + this.processor.addParameter(name, "", nsURI); + }else{ + this.processor.addParameter(name, ""); }; - return oDoc; }; - };//if(window.XMLDocument) - + }; + this.paramsSet = new Array(); + }; +}else{ /* end IE initialization, try to deal with real browsers now ;-) */ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ /** *

Ensures the document was loaded correctly, otherwise sets the * parseError to -1 to indicate something went wrong. Internal use

* @private */ Sarissa.__handleLoad__ = function(oDoc){ - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") - oDoc.parseError = -1; Sarissa.__setReadyState__(oDoc, 4); }; - /** *

Attached by an event handler to the load event. Internal use.

* @private @@ -325,7 +335,6 @@ _sarissa_XMLDocument_onload = function(){ Sarissa.__handleLoad__(this); }; - /** *

Sets the readyState property of the given DOM Document object. * Internal use.

@@ -336,80 +345,129 @@ */ Sarissa.__setReadyState__ = function(oDoc, iReadyState){ oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") oDoc.onreadystatechange(); }; - /** - *

Factory method to obtain a new DOM Document object

- * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + *

Emulate IE's onreadystatechange attribute

+ */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

+ *
  • 1 == LOADING,
    • + *
  • 2 == LOADED,
    • + *
  • 3 == INTERACTIVE,
    • + *
  • 4 == COMPLETED
+ */ + oDoc.readyState = 0; + }; oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); return oDoc; - }; + }; + if(window.XMLDocument){ + // do nothing + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ + //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good + /** + *

Factory method to obtain a new DOM Document object

+ * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + return oDoc; + }; + }; };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) }; //========================================== // Common stuff //========================================== if(!window.DOMParser){ - /** - * DOMParser is a utility class, used to construct DOMDocuments from XML strings - * @constructor - */ - DOMParser = function() { + if(_SARISSA_IS_SAFARI){ + /* + * DOMParser is a utility class, used to construct DOMDocuments from XML strings + * @constructor + */ + DOMParser = function() { }; + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ + DOMParser = function() { }; + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; - }; - }; -if(window.XMLHttpRequest){ - Sarissa.IS_ENABLED_XMLHTTP = true; -} -else if(_SARISSA_IS_IE){ - /** - * Emulate XMLHttpRequest - * @constructor - */ - XMLHttpRequest = function() { - return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); - }; - Sarissa.IS_ENABLED_XMLHTTP = true; -}; - -if(!window.document.importNode && _SARISSA_IS_IE){ +if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ try{ /** - * Implements importNode for the current window document in IE using innerHTML. - * Testing showed that DOM was multiple times slower than innerHTML for this, - * sorry folks. If you encounter trouble (who knows what IE does behind innerHTML) - * please gimme a call. + * Implementation of importNode for the context window document in IE. + * If oNode is a TextNode, bChildren is ignored. * @param oNode the Node to import * @param bChildren whether to include the children of oNode * @returns the imported node for further use */ - window.document.importNode = function(oNode, bChildren){ - var importNode = document.createElement("div"); - if(bChildren) - importNode.innerHTML = Sarissa.serialize(oNode); - else - importNode.innerHTML = Sarissa.serialize(oNode.cloneNode(false)); - return importNode.firstChild; + document.importNode = function(oNode, bChildren){ + var tmp; + if (oNode.nodeName=='#text') { + return document.createTextElement(oNode.data); + } + else { + if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ + tmp = document.createElement("table"); + } + else if(oNode.nodeName == "td"){ + tmp = document.createElement("tr"); + } + else if(oNode.nodeName == "option"){ + tmp = document.createElement("select"); + } + else{ + tmp = document.createElement("div"); + }; + if(bChildren){ + tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; + }else{ + tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; + }; + return tmp.getElementsByTagName("*")[0]; + }; + }; - }catch(e){}; + }catch(e){ }; }; if(!Sarissa.getParseErrorText){ /** @@ -423,17 +481,16 @@ */ Sarissa.getParseErrorText = function (oDoc){ var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ - /*moz*/ - if(oDoc.documentElement.tagName == "parsererror"){ - parseErrorText = oDoc.documentElement.firstChild.data; - parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; - }/*konq*/ - else if(oDoc.documentElement.tagName == "html"){ - parseErrorText = Sarissa.getText(oDoc.documentElement.getElementsByTagName("h1")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false); - }; + if(!oDoc.documentElement){ + parseErrorText = Sarissa.PARSED_EMPTY; + } else if(oDoc.documentElement.tagName == "parsererror"){ + parseErrorText = oDoc.documentElement.firstChild.data; + parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; + } else if(oDoc.getElementsByTagName("parsererror").length > 0){ + var parsererror = oDoc.getElementsByTagName("parsererror")[0]; + parseErrorText = Sarissa.getText(parsererror, true)+"\n"; + } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ + parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; }; return parseErrorText; }; @@ -446,8 +503,7 @@ var nodeType = node.nodeType; if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ s += node.data; - } - else if(deep == true + } else if(deep == true && (nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ @@ -456,33 +512,20 @@ }; return s; }; -if(window.XMLSerializer){ +if(!window.XMLSerializer + && Sarissa.getDomDocument + && Sarissa.getDomDocument("","foo", null).xml){ /** - *

Factory method to obtain the serialization of a DOM Node

- * @returns the serialized Node as an XML string + * Utility class to serialize DOM Node objects to XML strings + * @constructor */ - Sarissa.serialize = function(oDoc){ - return (new XMLSerializer()).serializeToString(oDoc); - }; -}else{ - if((Sarissa.getDomDocument("","foo", null)).xml){ - // see non-IE version - Sarissa.serialize = function(oDoc) { - // TODO: check for HTML document and return innerHTML instead - return oDoc.xml; - }; - /** - * Utility class to serialize DOM Node objects to XML strings - * @constructor - */ - XMLSerializer = function(){}; - /** - * Serialize the given DOM Node to an XML string - * @param oNode the DOM Node to serialize - */ - XMLSerializer.prototype.serializeToString = function(oNode) { - return oNode.xml; - }; + XMLSerializer = function(){}; + /** + * Serialize the given DOM Node to an XML string + * @param oNode the DOM Node to serialize + */ + XMLSerializer.prototype.serializeToString = function(oNode) { + return oNode.xml; }; }; @@ -497,7 +540,8 @@ * @argument oNode the Node to empty */ Sarissa.clearChildNodes = function(oNode) { - while(oNode.hasChildNodes()){ + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild) { oNode.removeChild(oNode.firstChild); }; }; @@ -510,17 +554,19 @@ * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false */ Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; var nodes = nodeFrom.childNodes; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { + if(typeof(ownerDoc.importNode) != "undefined") { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); }; - } - else{ + } else { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(nodes[i].cloneNode(true)); }; @@ -533,32 +579,34 @@ * the move operation, unless you supply a true third parameter

* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; - var nodes = nodeFrom.childNodes; // if within the same doc, just move, else copy and delete if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - nodeTo.appendChild(nodes[i]); - }else{ + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; + } else { var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } - else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; }; Sarissa.clearChildNodes(nodeFrom); }; - }; /** diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/Common/QtConfigurator/Resources/scripts/sarissa.js --- a/examples/Common/QtConfigurator/Resources/scripts/sarissa.js Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/Common/QtConfigurator/Resources/scripts/sarissa.js Sat Jul 07 16:17:29 2007 +0000 @@ -2,72 +2,54 @@ * ==================================================================== * About * ==================================================================== - * Sarissa cross browser XML library - * @version 0.9.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. * The library supports Gecko based browsers like Mozilla and Firefox, - * Internet Explorer (5.5+ with MSXML3.0+) and, last but not least, KHTML based browsers like - * Konqueror and Safari. - * + * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net * ==================================================================== * Licence * ==================================================================== - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 or - * the GNU Lesser General Public License version 2.1 as published by - * the Free Software Foundation (your choice of the two). - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License or GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * or GNU Lesser General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * or visit http://www.gnu.org - * + * Sarissa is free software distributed under the GNU GPL version 2 (see gpl.txt) or higher, + * GNU LGPL version 2.1 (see lgpl.txt) or higher and Apache Software License 2.0 or higher + * (see asl.txt). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at http://www.gnu.org and + * http://www.apache.org. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /** - *

Sarissa is a utility class. Provides static methods for DOMDocument and - * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.

+ *

Sarissa is a utility class. Provides "static" methods for DOMDocument, + * DOM Node serialization to XML strings and other utility goodies.

* @constructor */ function Sarissa(){}; -/** @private */ +Sarissa.VERSION = "${project.version}"; Sarissa.PARSED_OK = "Document contains no parsing errors"; -/** - * Tells you whether transformNode and transformNodeToObject are available. This functionality - * is contained in sarissa_ieemu_xslt.js and is deprecated. If you want to control XSLT transformations - * use the XSLTProcessor - * @deprecated - * @type boolean - */ +Sarissa.PARSED_EMPTY = "Document is empty"; +Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; Sarissa.IS_ENABLED_TRANSFORM_NODE = false; -/** - * tells you whether XMLHttpRequest (or equivalent) is available - * @type boolean - */ -Sarissa.IS_ENABLED_XMLHTTP = false; -/** - * tells you whether selectNodes/selectSingleNode is available - * @type boolean - */ -Sarissa.IS_ENABLED_SELECT_NODES = false; var _sarissa_iNsCounter = 0; var _SARISSA_IEPREFIX4XSLPARAM = ""; var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; +if(!window.Node || !Node.ELEMENT_NODE){ + Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; +}; -if(!window.Node || !window.Node.ELEMENT_NODE){ - var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; -}; +if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } // IE initialization if(_SARISSA_IS_IE){ @@ -76,13 +58,15 @@ // used to store the most recent ProgID available out of the above var _SARISSA_DOM_PROGID = ""; var _SARISSA_XMLHTTP_PROGID = ""; + var _SARISSA_DOM_XMLWRITER = ""; /** * Called when the Sarissa_xx.js file is parsed, to pick most recent * ProgIDs for IE, then gets destroyed. + * @private * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled */ - pickRecentProgID = function (idList, enabledList){ + Sarissa.pickRecentProgID = function (idList){ // found progID flag var bFound = false; for(var i=0; i < idList.length && !bFound; i++){ @@ -90,50 +74,69 @@ var oDoc = new ActiveXObject(idList[i]); o2Store = idList[i]; bFound = true; - for(var j=0;j"); - // don't use the same prefix again - ++_sarissa_iNsCounter; - } - else - oDoc.loadXML("<" + sName + "/>"); + // create an artifical namespace prefix + // or reuse existing prefix if applicable + var prefix = ""; + if(sUri){ + if(sName.indexOf(":") > 1){ + prefix = sName.substring(0, sName.indexOf(":")); + sName = sName.substring(sName.indexOf(":")+1); + }else{ + prefix = "a" + (_sarissa_iNsCounter++); + }; + }; + // use namespaces if a namespace URI exists + if(sUri){ + oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); + } else { + oDoc.loadXML('<' + sName + " />"); + }; }; return oDoc; }; // see non-IE version Sarissa.getParseErrorText = function (oDoc) { var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ + if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode != 0){ parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + "\nLocation: " + oDoc.parseError.url + "\nLine Number " + oDoc.parseError.line + ", Column " + @@ -144,6 +147,9 @@ parseErrorText += "-"; }; parseErrorText += "^\n"; + } + else if(oDoc.documentElement == null){ + parseErrorText = Sarissa.PARSED_EMPTY; }; return parseErrorText; }; @@ -158,43 +164,109 @@ * @constructor */ XSLTProcessor = function(){ + if(!_SARISSA_XSLTEMPLATE_PROGID){ + _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); + }; this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); this.processor = null; }; /** - * Impoprts the given XSLT DOM and compiles it to a reusable transform + * Imports the given XSLT DOM and compiles it to a reusable transform + * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those * @argument xslDoc The XSLT DOMDocument to import */ XSLTProcessor.prototype.importStylesheet = function(xslDoc){ + if(!_SARISSA_THREADEDDOM_PROGID){ + _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); + }; + xslDoc.setProperty("SelectionLanguage", "XPath"); + xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); - converted.loadXML(xslDoc.xml); + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + // make included/imported stylesheets work if exist and xsl was originally loaded from url + if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ + converted.async = false; + if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { + converted.setProperty("AllowDocumentFunction", true); + converted.resolveExternals = true; + } + converted.load(xslDoc.url); + } else { + converted.loadXML(xslDoc.xml); + }; + converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + var output = converted.selectSingleNode("//xsl:output"); + this.outputMethod = output ? output.getAttribute("method") : "html"; this.template.stylesheet = converted; this.processor = this.template.createProcessor(); - // (re)set default param values + // for getParameter and clearParameters this.paramsSet = new Array(); }; + /** - * Transform the given XML DOM + * Transform the given XML DOM and return the transformation result as a new DOM document * @argument sourceDoc The XML DOMDocument to transform * @return The transformation result as a DOM Document */ XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ - this.processor.input = sourceDoc; - var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output = outDoc; - this.processor.transform(); - return outDoc; + // fix for bug 1549749 + if(_SARISSA_THREADEDDOM_PROGID){ + this.processor.input=sourceDoc; + var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); + this.processor.output=outDoc; + this.processor.transform(); + return outDoc; + } + else{ + if(!_SARISSA_DOM_XMLWRITER){ + _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); + }; + this.processor.input = sourceDoc; + var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); + this.processor.output = outDoc; + this.processor.transform(); + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + oDoc.loadXML(outDoc.output+""); + return oDoc; + }; }; + /** - * Not sure if this works in IE. Maybe this will allow non-well-formed - * transformation results (i.e. with no single root element) + * Transform the given XML DOM and return the transformation result as a new DOM fragment. + * Note: The xsl:output method must match the nature of the owner document (XML/HTML). * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Fragment + * @argument ownerDoc The owner of the result fragment + * @return The transformation result as a DOM Document */ - XSLTProcessor.prototype.transformToFragment = function(sourceDoc, ownerDocument){ - return this.transformToDocument(sourceDoc); + XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { + this.processor.input = sourceDoc; + this.processor.transform(); + var s = this.processor.output; + var f = ownerDoc.createDocumentFragment(); + if (this.outputMethod == 'text') { + f.appendChild(ownerDoc.createTextNode(s)); + } else if (ownerDoc.body && ownerDoc.body.innerHTML) { + var container = ownerDoc.createElement('div'); + container.innerHTML = s; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + else { + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + if (s.substring(0, 5) == '') + 2); + } + var xml = ''.concat('', s, ''); + oDoc.loadXML(xml); + var container = oDoc.documentElement; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + return f; }; + /** * Set global XSLT parameter of the imported stylesheet * @argument nsURI The parameter namespace URI @@ -202,13 +274,15 @@ * @argument value The new parameter value */ XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ - /* nsURI is optional but cannot be null */ + // make value a zero length string if null to allow clearing + value = value ? value : ""; + // nsURI is optional but cannot be null if(nsURI){ this.processor.addParameter(name, value, nsURI); }else{ this.processor.addParameter(name, value); }; - /* update updated params for getParameter */ + // update updated params for getParameter if(!this.paramsSet[""+nsURI]){ this.paramsSet[""+nsURI] = new Array(); }; @@ -222,102 +296,38 @@ * @return The parameter value if reviously set by setParameter, null otherwise */ XSLTProcessor.prototype.getParameter = function(nsURI, name){ - if(this.paramsSet[""+nsURI] && this.paramsSet[""+nsURI][name]) - return this.paramsSet[""+nsURI][name]; - else + nsURI = "" + nsURI; + if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ + return this.paramsSet[nsURI][name]; + }else{ return null; + }; }; -} -else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - if(window.XMLDocument){ - /** - *

Emulate IE's onreadystatechange attribute

- */ - XMLDocument.prototype.onreadystatechange = null; - /** - *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

- *
  • 1 == LOADING,
    • - *
  • 2 == LOADED,
    • - *
  • 3 == INTERACTIVE,
    • - *
  • 4 == COMPLETED
- */ - XMLDocument.prototype.readyState = 0; - /** - *

Emulate IE's parseError attribute

- */ - XMLDocument.prototype.parseError = 0; - - // NOTE: setting async to false will only work with documents - // called over HTTP (meaning a server), not the local file system, - // unless you are using Moz 1.4+. - // BTW the try>catch block is for 1.4; I haven't found a way to check if - // the property is implemented without - // causing an error and I dont want to use user agent stuff for that... - var _SARISSA_SYNC_NON_IMPLEMENTED = false; - try{ - /** - *

Emulates IE's async property for Moz versions prior to 1.4. - * It controls whether loading of remote XML files works - * synchronously or asynchronously.

- */ - XMLDocument.prototype.async = true; - _SARISSA_SYNC_NON_IMPLEMENTED = true; - }catch(e){/* trap */}; - /** - *

Keeps a handle to the original load() method. Internal use and only - * if Mozilla version is lower than 1.4

- * @private - */ - XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; - - /** - *

Overrides the original load method to provide synchronous loading for - * Mozilla versions prior to 1.4, using an XMLHttpRequest object (if - * async is set to false)

- * @returns the DOM Object as it was before the load() call (may be empty) - */ - XMLDocument.prototype.load = function(sURI) { - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - this.parseError = 0; - Sarissa.__setReadyState__(this, 1); - try { - if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sURI, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, this); - Sarissa.__setReadyState__(this, 3); - } - else { - this._sarissa_load(sURI); - }; - } - catch (objException) { - this.parseError = -1; - } - finally { - if(this.async == false){ - Sarissa.__handleLoad__(this); - }; + /** + * Clear parameters (set them to default values as defined in the stylesheet itself) + */ + XSLTProcessor.prototype.clearParameters = function(){ + for(var nsURI in this.paramsSet){ + for(var name in this.paramsSet[nsURI]){ + if(nsURI){ + this.processor.addParameter(name, "", nsURI); + }else{ + this.processor.addParameter(name, ""); }; - return oDoc; }; - };//if(window.XMLDocument) - + }; + this.paramsSet = new Array(); + }; +}else{ /* end IE initialization, try to deal with real browsers now ;-) */ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ /** *

Ensures the document was loaded correctly, otherwise sets the * parseError to -1 to indicate something went wrong. Internal use

* @private */ Sarissa.__handleLoad__ = function(oDoc){ - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") - oDoc.parseError = -1; Sarissa.__setReadyState__(oDoc, 4); }; - /** *

Attached by an event handler to the load event. Internal use.

* @private @@ -325,7 +335,6 @@ _sarissa_XMLDocument_onload = function(){ Sarissa.__handleLoad__(this); }; - /** *

Sets the readyState property of the given DOM Document object. * Internal use.

@@ -336,80 +345,129 @@ */ Sarissa.__setReadyState__ = function(oDoc, iReadyState){ oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") oDoc.onreadystatechange(); }; - /** - *

Factory method to obtain a new DOM Document object

- * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + *

Emulate IE's onreadystatechange attribute

+ */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

+ *
  • 1 == LOADING,
    • + *
  • 2 == LOADED,
    • + *
  • 3 == INTERACTIVE,
    • + *
  • 4 == COMPLETED
+ */ + oDoc.readyState = 0; + }; oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); return oDoc; - }; + }; + if(window.XMLDocument){ + // do nothing + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ + //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good + /** + *

Factory method to obtain a new DOM Document object

+ * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + return oDoc; + }; + }; };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) }; //========================================== // Common stuff //========================================== if(!window.DOMParser){ - /** - * DOMParser is a utility class, used to construct DOMDocuments from XML strings - * @constructor - */ - DOMParser = function() { + if(_SARISSA_IS_SAFARI){ + /* + * DOMParser is a utility class, used to construct DOMDocuments from XML strings + * @constructor + */ + DOMParser = function() { }; + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ + DOMParser = function() { }; + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; - }; - }; -if(window.XMLHttpRequest){ - Sarissa.IS_ENABLED_XMLHTTP = true; -} -else if(_SARISSA_IS_IE){ - /** - * Emulate XMLHttpRequest - * @constructor - */ - XMLHttpRequest = function() { - return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); - }; - Sarissa.IS_ENABLED_XMLHTTP = true; -}; - -if(!window.document.importNode && _SARISSA_IS_IE){ +if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ try{ /** - * Implements importNode for the current window document in IE using innerHTML. - * Testing showed that DOM was multiple times slower than innerHTML for this, - * sorry folks. If you encounter trouble (who knows what IE does behind innerHTML) - * please gimme a call. + * Implementation of importNode for the context window document in IE. + * If oNode is a TextNode, bChildren is ignored. * @param oNode the Node to import * @param bChildren whether to include the children of oNode * @returns the imported node for further use */ - window.document.importNode = function(oNode, bChildren){ - var importNode = document.createElement("div"); - if(bChildren) - importNode.innerHTML = Sarissa.serialize(oNode); - else - importNode.innerHTML = Sarissa.serialize(oNode.cloneNode(false)); - return importNode.firstChild; + document.importNode = function(oNode, bChildren){ + var tmp; + if (oNode.nodeName=='#text') { + return document.createTextElement(oNode.data); + } + else { + if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ + tmp = document.createElement("table"); + } + else if(oNode.nodeName == "td"){ + tmp = document.createElement("tr"); + } + else if(oNode.nodeName == "option"){ + tmp = document.createElement("select"); + } + else{ + tmp = document.createElement("div"); + }; + if(bChildren){ + tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; + }else{ + tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; + }; + return tmp.getElementsByTagName("*")[0]; + }; + }; - }catch(e){}; + }catch(e){ }; }; if(!Sarissa.getParseErrorText){ /** @@ -423,17 +481,16 @@ */ Sarissa.getParseErrorText = function (oDoc){ var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ - /*moz*/ - if(oDoc.documentElement.tagName == "parsererror"){ - parseErrorText = oDoc.documentElement.firstChild.data; - parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; - }/*konq*/ - else if(oDoc.documentElement.tagName == "html"){ - parseErrorText = Sarissa.getText(oDoc.documentElement.getElementsByTagName("h1")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false); - }; + if(!oDoc.documentElement){ + parseErrorText = Sarissa.PARSED_EMPTY; + } else if(oDoc.documentElement.tagName == "parsererror"){ + parseErrorText = oDoc.documentElement.firstChild.data; + parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; + } else if(oDoc.getElementsByTagName("parsererror").length > 0){ + var parsererror = oDoc.getElementsByTagName("parsererror")[0]; + parseErrorText = Sarissa.getText(parsererror, true)+"\n"; + } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ + parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; }; return parseErrorText; }; @@ -446,8 +503,7 @@ var nodeType = node.nodeType; if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ s += node.data; - } - else if(deep == true + } else if(deep == true && (nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ @@ -456,33 +512,20 @@ }; return s; }; -if(window.XMLSerializer){ +if(!window.XMLSerializer + && Sarissa.getDomDocument + && Sarissa.getDomDocument("","foo", null).xml){ /** - *

Factory method to obtain the serialization of a DOM Node

- * @returns the serialized Node as an XML string + * Utility class to serialize DOM Node objects to XML strings + * @constructor */ - Sarissa.serialize = function(oDoc){ - return (new XMLSerializer()).serializeToString(oDoc); - }; -}else{ - if((Sarissa.getDomDocument("","foo", null)).xml){ - // see non-IE version - Sarissa.serialize = function(oDoc) { - // TODO: check for HTML document and return innerHTML instead - return oDoc.xml; - }; - /** - * Utility class to serialize DOM Node objects to XML strings - * @constructor - */ - XMLSerializer = function(){}; - /** - * Serialize the given DOM Node to an XML string - * @param oNode the DOM Node to serialize - */ - XMLSerializer.prototype.serializeToString = function(oNode) { - return oNode.xml; - }; + XMLSerializer = function(){}; + /** + * Serialize the given DOM Node to an XML string + * @param oNode the DOM Node to serialize + */ + XMLSerializer.prototype.serializeToString = function(oNode) { + return oNode.xml; }; }; @@ -497,7 +540,8 @@ * @argument oNode the Node to empty */ Sarissa.clearChildNodes = function(oNode) { - while(oNode.hasChildNodes()){ + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild) { oNode.removeChild(oNode.firstChild); }; }; @@ -510,17 +554,19 @@ * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false */ Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; var nodes = nodeFrom.childNodes; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { + if(typeof(ownerDoc.importNode) != "undefined") { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); }; - } - else{ + } else { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(nodes[i].cloneNode(true)); }; @@ -533,32 +579,34 @@ * the move operation, unless you supply a true third parameter

* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; - var nodes = nodeFrom.childNodes; // if within the same doc, just move, else copy and delete if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - nodeTo.appendChild(nodes[i]); - }else{ + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; + } else { var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } - else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; }; Sarissa.clearChildNodes(nodeFrom); }; - }; /** diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/Common/VerySimple/Resources/scripts/sarissa.js --- a/examples/Common/VerySimple/Resources/scripts/sarissa.js Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/Common/VerySimple/Resources/scripts/sarissa.js Sat Jul 07 16:17:29 2007 +0000 @@ -2,72 +2,54 @@ * ==================================================================== * About * ==================================================================== - * Sarissa cross browser XML library - * @version 0.9.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. * The library supports Gecko based browsers like Mozilla and Firefox, - * Internet Explorer (5.5+ with MSXML3.0+) and, last but not least, KHTML based browsers like - * Konqueror and Safari. - * + * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net * ==================================================================== * Licence * ==================================================================== - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 or - * the GNU Lesser General Public License version 2.1 as published by - * the Free Software Foundation (your choice of the two). - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License or GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * or GNU Lesser General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * or visit http://www.gnu.org - * + * Sarissa is free software distributed under the GNU GPL version 2 (see gpl.txt) or higher, + * GNU LGPL version 2.1 (see lgpl.txt) or higher and Apache Software License 2.0 or higher + * (see asl.txt). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at http://www.gnu.org and + * http://www.apache.org. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /** - *

Sarissa is a utility class. Provides static methods for DOMDocument and - * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.

+ *

Sarissa is a utility class. Provides "static" methods for DOMDocument, + * DOM Node serialization to XML strings and other utility goodies.

* @constructor */ function Sarissa(){}; -/** @private */ +Sarissa.VERSION = "${project.version}"; Sarissa.PARSED_OK = "Document contains no parsing errors"; -/** - * Tells you whether transformNode and transformNodeToObject are available. This functionality - * is contained in sarissa_ieemu_xslt.js and is deprecated. If you want to control XSLT transformations - * use the XSLTProcessor - * @deprecated - * @type boolean - */ +Sarissa.PARSED_EMPTY = "Document is empty"; +Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; Sarissa.IS_ENABLED_TRANSFORM_NODE = false; -/** - * tells you whether XMLHttpRequest (or equivalent) is available - * @type boolean - */ -Sarissa.IS_ENABLED_XMLHTTP = false; -/** - * tells you whether selectNodes/selectSingleNode is available - * @type boolean - */ -Sarissa.IS_ENABLED_SELECT_NODES = false; var _sarissa_iNsCounter = 0; var _SARISSA_IEPREFIX4XSLPARAM = ""; var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; +if(!window.Node || !Node.ELEMENT_NODE){ + Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; +}; -if(!window.Node || !window.Node.ELEMENT_NODE){ - var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; -}; +if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } // IE initialization if(_SARISSA_IS_IE){ @@ -76,13 +58,15 @@ // used to store the most recent ProgID available out of the above var _SARISSA_DOM_PROGID = ""; var _SARISSA_XMLHTTP_PROGID = ""; + var _SARISSA_DOM_XMLWRITER = ""; /** * Called when the Sarissa_xx.js file is parsed, to pick most recent * ProgIDs for IE, then gets destroyed. + * @private * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled */ - pickRecentProgID = function (idList, enabledList){ + Sarissa.pickRecentProgID = function (idList){ // found progID flag var bFound = false; for(var i=0; i < idList.length && !bFound; i++){ @@ -90,50 +74,69 @@ var oDoc = new ActiveXObject(idList[i]); o2Store = idList[i]; bFound = true; - for(var j=0;j"); - // don't use the same prefix again - ++_sarissa_iNsCounter; - } - else - oDoc.loadXML("<" + sName + "/>"); + // create an artifical namespace prefix + // or reuse existing prefix if applicable + var prefix = ""; + if(sUri){ + if(sName.indexOf(":") > 1){ + prefix = sName.substring(0, sName.indexOf(":")); + sName = sName.substring(sName.indexOf(":")+1); + }else{ + prefix = "a" + (_sarissa_iNsCounter++); + }; + }; + // use namespaces if a namespace URI exists + if(sUri){ + oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); + } else { + oDoc.loadXML('<' + sName + " />"); + }; }; return oDoc; }; // see non-IE version Sarissa.getParseErrorText = function (oDoc) { var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ + if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode != 0){ parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + "\nLocation: " + oDoc.parseError.url + "\nLine Number " + oDoc.parseError.line + ", Column " + @@ -144,6 +147,9 @@ parseErrorText += "-"; }; parseErrorText += "^\n"; + } + else if(oDoc.documentElement == null){ + parseErrorText = Sarissa.PARSED_EMPTY; }; return parseErrorText; }; @@ -158,43 +164,109 @@ * @constructor */ XSLTProcessor = function(){ + if(!_SARISSA_XSLTEMPLATE_PROGID){ + _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); + }; this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); this.processor = null; }; /** - * Impoprts the given XSLT DOM and compiles it to a reusable transform + * Imports the given XSLT DOM and compiles it to a reusable transform + * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those * @argument xslDoc The XSLT DOMDocument to import */ XSLTProcessor.prototype.importStylesheet = function(xslDoc){ + if(!_SARISSA_THREADEDDOM_PROGID){ + _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); + }; + xslDoc.setProperty("SelectionLanguage", "XPath"); + xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); - converted.loadXML(xslDoc.xml); + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + // make included/imported stylesheets work if exist and xsl was originally loaded from url + if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ + converted.async = false; + if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { + converted.setProperty("AllowDocumentFunction", true); + converted.resolveExternals = true; + } + converted.load(xslDoc.url); + } else { + converted.loadXML(xslDoc.xml); + }; + converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + var output = converted.selectSingleNode("//xsl:output"); + this.outputMethod = output ? output.getAttribute("method") : "html"; this.template.stylesheet = converted; this.processor = this.template.createProcessor(); - // (re)set default param values + // for getParameter and clearParameters this.paramsSet = new Array(); }; + /** - * Transform the given XML DOM + * Transform the given XML DOM and return the transformation result as a new DOM document * @argument sourceDoc The XML DOMDocument to transform * @return The transformation result as a DOM Document */ XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ - this.processor.input = sourceDoc; - var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output = outDoc; - this.processor.transform(); - return outDoc; + // fix for bug 1549749 + if(_SARISSA_THREADEDDOM_PROGID){ + this.processor.input=sourceDoc; + var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); + this.processor.output=outDoc; + this.processor.transform(); + return outDoc; + } + else{ + if(!_SARISSA_DOM_XMLWRITER){ + _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); + }; + this.processor.input = sourceDoc; + var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); + this.processor.output = outDoc; + this.processor.transform(); + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + oDoc.loadXML(outDoc.output+""); + return oDoc; + }; }; + /** - * Not sure if this works in IE. Maybe this will allow non-well-formed - * transformation results (i.e. with no single root element) + * Transform the given XML DOM and return the transformation result as a new DOM fragment. + * Note: The xsl:output method must match the nature of the owner document (XML/HTML). * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Fragment + * @argument ownerDoc The owner of the result fragment + * @return The transformation result as a DOM Document */ - XSLTProcessor.prototype.transformToFragment = function(sourceDoc, ownerDocument){ - return this.transformToDocument(sourceDoc); + XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { + this.processor.input = sourceDoc; + this.processor.transform(); + var s = this.processor.output; + var f = ownerDoc.createDocumentFragment(); + if (this.outputMethod == 'text') { + f.appendChild(ownerDoc.createTextNode(s)); + } else if (ownerDoc.body && ownerDoc.body.innerHTML) { + var container = ownerDoc.createElement('div'); + container.innerHTML = s; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + else { + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + if (s.substring(0, 5) == '') + 2); + } + var xml = ''.concat('', s, ''); + oDoc.loadXML(xml); + var container = oDoc.documentElement; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + return f; }; + /** * Set global XSLT parameter of the imported stylesheet * @argument nsURI The parameter namespace URI @@ -202,13 +274,15 @@ * @argument value The new parameter value */ XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ - /* nsURI is optional but cannot be null */ + // make value a zero length string if null to allow clearing + value = value ? value : ""; + // nsURI is optional but cannot be null if(nsURI){ this.processor.addParameter(name, value, nsURI); }else{ this.processor.addParameter(name, value); }; - /* update updated params for getParameter */ + // update updated params for getParameter if(!this.paramsSet[""+nsURI]){ this.paramsSet[""+nsURI] = new Array(); }; @@ -222,102 +296,38 @@ * @return The parameter value if reviously set by setParameter, null otherwise */ XSLTProcessor.prototype.getParameter = function(nsURI, name){ - if(this.paramsSet[""+nsURI] && this.paramsSet[""+nsURI][name]) - return this.paramsSet[""+nsURI][name]; - else + nsURI = "" + nsURI; + if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ + return this.paramsSet[nsURI][name]; + }else{ return null; + }; }; -} -else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - if(window.XMLDocument){ - /** - *

Emulate IE's onreadystatechange attribute

- */ - XMLDocument.prototype.onreadystatechange = null; - /** - *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

- *
  • 1 == LOADING,
    • - *
  • 2 == LOADED,
    • - *
  • 3 == INTERACTIVE,
    • - *
  • 4 == COMPLETED
- */ - XMLDocument.prototype.readyState = 0; - /** - *

Emulate IE's parseError attribute

- */ - XMLDocument.prototype.parseError = 0; - - // NOTE: setting async to false will only work with documents - // called over HTTP (meaning a server), not the local file system, - // unless you are using Moz 1.4+. - // BTW the try>catch block is for 1.4; I haven't found a way to check if - // the property is implemented without - // causing an error and I dont want to use user agent stuff for that... - var _SARISSA_SYNC_NON_IMPLEMENTED = false; - try{ - /** - *

Emulates IE's async property for Moz versions prior to 1.4. - * It controls whether loading of remote XML files works - * synchronously or asynchronously.

- */ - XMLDocument.prototype.async = true; - _SARISSA_SYNC_NON_IMPLEMENTED = true; - }catch(e){/* trap */}; - /** - *

Keeps a handle to the original load() method. Internal use and only - * if Mozilla version is lower than 1.4

- * @private - */ - XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; - - /** - *

Overrides the original load method to provide synchronous loading for - * Mozilla versions prior to 1.4, using an XMLHttpRequest object (if - * async is set to false)

- * @returns the DOM Object as it was before the load() call (may be empty) - */ - XMLDocument.prototype.load = function(sURI) { - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - this.parseError = 0; - Sarissa.__setReadyState__(this, 1); - try { - if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sURI, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, this); - Sarissa.__setReadyState__(this, 3); - } - else { - this._sarissa_load(sURI); - }; - } - catch (objException) { - this.parseError = -1; - } - finally { - if(this.async == false){ - Sarissa.__handleLoad__(this); - }; + /** + * Clear parameters (set them to default values as defined in the stylesheet itself) + */ + XSLTProcessor.prototype.clearParameters = function(){ + for(var nsURI in this.paramsSet){ + for(var name in this.paramsSet[nsURI]){ + if(nsURI){ + this.processor.addParameter(name, "", nsURI); + }else{ + this.processor.addParameter(name, ""); }; - return oDoc; }; - };//if(window.XMLDocument) - + }; + this.paramsSet = new Array(); + }; +}else{ /* end IE initialization, try to deal with real browsers now ;-) */ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ /** *

Ensures the document was loaded correctly, otherwise sets the * parseError to -1 to indicate something went wrong. Internal use

* @private */ Sarissa.__handleLoad__ = function(oDoc){ - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") - oDoc.parseError = -1; Sarissa.__setReadyState__(oDoc, 4); }; - /** *

Attached by an event handler to the load event. Internal use.

* @private @@ -325,7 +335,6 @@ _sarissa_XMLDocument_onload = function(){ Sarissa.__handleLoad__(this); }; - /** *

Sets the readyState property of the given DOM Document object. * Internal use.

@@ -336,80 +345,129 @@ */ Sarissa.__setReadyState__ = function(oDoc, iReadyState){ oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") oDoc.onreadystatechange(); }; - /** - *

Factory method to obtain a new DOM Document object

- * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + *

Emulate IE's onreadystatechange attribute

+ */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

+ *
  • 1 == LOADING,
    • + *
  • 2 == LOADED,
    • + *
  • 3 == INTERACTIVE,
    • + *
  • 4 == COMPLETED
+ */ + oDoc.readyState = 0; + }; oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); return oDoc; - }; + }; + if(window.XMLDocument){ + // do nothing + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ + //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good + /** + *

Factory method to obtain a new DOM Document object

+ * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + return oDoc; + }; + }; };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) }; //========================================== // Common stuff //========================================== if(!window.DOMParser){ - /** - * DOMParser is a utility class, used to construct DOMDocuments from XML strings - * @constructor - */ - DOMParser = function() { + if(_SARISSA_IS_SAFARI){ + /* + * DOMParser is a utility class, used to construct DOMDocuments from XML strings + * @constructor + */ + DOMParser = function() { }; + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ + DOMParser = function() { }; + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; - }; - }; -if(window.XMLHttpRequest){ - Sarissa.IS_ENABLED_XMLHTTP = true; -} -else if(_SARISSA_IS_IE){ - /** - * Emulate XMLHttpRequest - * @constructor - */ - XMLHttpRequest = function() { - return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); - }; - Sarissa.IS_ENABLED_XMLHTTP = true; -}; - -if(!window.document.importNode && _SARISSA_IS_IE){ +if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ try{ /** - * Implements importNode for the current window document in IE using innerHTML. - * Testing showed that DOM was multiple times slower than innerHTML for this, - * sorry folks. If you encounter trouble (who knows what IE does behind innerHTML) - * please gimme a call. + * Implementation of importNode for the context window document in IE. + * If oNode is a TextNode, bChildren is ignored. * @param oNode the Node to import * @param bChildren whether to include the children of oNode * @returns the imported node for further use */ - window.document.importNode = function(oNode, bChildren){ - var importNode = document.createElement("div"); - if(bChildren) - importNode.innerHTML = Sarissa.serialize(oNode); - else - importNode.innerHTML = Sarissa.serialize(oNode.cloneNode(false)); - return importNode.firstChild; + document.importNode = function(oNode, bChildren){ + var tmp; + if (oNode.nodeName=='#text') { + return document.createTextElement(oNode.data); + } + else { + if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ + tmp = document.createElement("table"); + } + else if(oNode.nodeName == "td"){ + tmp = document.createElement("tr"); + } + else if(oNode.nodeName == "option"){ + tmp = document.createElement("select"); + } + else{ + tmp = document.createElement("div"); + }; + if(bChildren){ + tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; + }else{ + tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; + }; + return tmp.getElementsByTagName("*")[0]; + }; + }; - }catch(e){}; + }catch(e){ }; }; if(!Sarissa.getParseErrorText){ /** @@ -423,17 +481,16 @@ */ Sarissa.getParseErrorText = function (oDoc){ var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ - /*moz*/ - if(oDoc.documentElement.tagName == "parsererror"){ - parseErrorText = oDoc.documentElement.firstChild.data; - parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; - }/*konq*/ - else if(oDoc.documentElement.tagName == "html"){ - parseErrorText = Sarissa.getText(oDoc.documentElement.getElementsByTagName("h1")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false); - }; + if(!oDoc.documentElement){ + parseErrorText = Sarissa.PARSED_EMPTY; + } else if(oDoc.documentElement.tagName == "parsererror"){ + parseErrorText = oDoc.documentElement.firstChild.data; + parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; + } else if(oDoc.getElementsByTagName("parsererror").length > 0){ + var parsererror = oDoc.getElementsByTagName("parsererror")[0]; + parseErrorText = Sarissa.getText(parsererror, true)+"\n"; + } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ + parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; }; return parseErrorText; }; @@ -446,8 +503,7 @@ var nodeType = node.nodeType; if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ s += node.data; - } - else if(deep == true + } else if(deep == true && (nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ @@ -456,33 +512,20 @@ }; return s; }; -if(window.XMLSerializer){ +if(!window.XMLSerializer + && Sarissa.getDomDocument + && Sarissa.getDomDocument("","foo", null).xml){ /** - *

Factory method to obtain the serialization of a DOM Node

- * @returns the serialized Node as an XML string + * Utility class to serialize DOM Node objects to XML strings + * @constructor */ - Sarissa.serialize = function(oDoc){ - return (new XMLSerializer()).serializeToString(oDoc); - }; -}else{ - if((Sarissa.getDomDocument("","foo", null)).xml){ - // see non-IE version - Sarissa.serialize = function(oDoc) { - // TODO: check for HTML document and return innerHTML instead - return oDoc.xml; - }; - /** - * Utility class to serialize DOM Node objects to XML strings - * @constructor - */ - XMLSerializer = function(){}; - /** - * Serialize the given DOM Node to an XML string - * @param oNode the DOM Node to serialize - */ - XMLSerializer.prototype.serializeToString = function(oNode) { - return oNode.xml; - }; + XMLSerializer = function(){}; + /** + * Serialize the given DOM Node to an XML string + * @param oNode the DOM Node to serialize + */ + XMLSerializer.prototype.serializeToString = function(oNode) { + return oNode.xml; }; }; @@ -497,7 +540,8 @@ * @argument oNode the Node to empty */ Sarissa.clearChildNodes = function(oNode) { - while(oNode.hasChildNodes()){ + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild) { oNode.removeChild(oNode.firstChild); }; }; @@ -510,17 +554,19 @@ * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false */ Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; var nodes = nodeFrom.childNodes; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { + if(typeof(ownerDoc.importNode) != "undefined") { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); }; - } - else{ + } else { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(nodes[i].cloneNode(true)); }; @@ -533,32 +579,34 @@ * the move operation, unless you supply a true third parameter

* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; - var nodes = nodeFrom.childNodes; // if within the same doc, just move, else copy and delete if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - nodeTo.appendChild(nodes[i]); - }else{ + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; + } else { var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } - else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; }; Sarissa.clearChildNodes(nodeFrom); }; - }; /** diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/Common/VerySimpleWithLogin/Resources/scripts/sarissa.js --- a/examples/Common/VerySimpleWithLogin/Resources/scripts/sarissa.js Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/Common/VerySimpleWithLogin/Resources/scripts/sarissa.js Sat Jul 07 16:17:29 2007 +0000 @@ -2,72 +2,54 @@ * ==================================================================== * About * ==================================================================== - * Sarissa cross browser XML library - * @version 0.9.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. * The library supports Gecko based browsers like Mozilla and Firefox, - * Internet Explorer (5.5+ with MSXML3.0+) and, last but not least, KHTML based browsers like - * Konqueror and Safari. - * + * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net * ==================================================================== * Licence * ==================================================================== - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 or - * the GNU Lesser General Public License version 2.1 as published by - * the Free Software Foundation (your choice of the two). - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License or GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * or GNU Lesser General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * or visit http://www.gnu.org - * + * Sarissa is free software distributed under the GNU GPL version 2 (see gpl.txt) or higher, + * GNU LGPL version 2.1 (see lgpl.txt) or higher and Apache Software License 2.0 or higher + * (see asl.txt). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at http://www.gnu.org and + * http://www.apache.org. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /** - *

Sarissa is a utility class. Provides static methods for DOMDocument and - * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.

+ *

Sarissa is a utility class. Provides "static" methods for DOMDocument, + * DOM Node serialization to XML strings and other utility goodies.

* @constructor */ function Sarissa(){}; -/** @private */ +Sarissa.VERSION = "${project.version}"; Sarissa.PARSED_OK = "Document contains no parsing errors"; -/** - * Tells you whether transformNode and transformNodeToObject are available. This functionality - * is contained in sarissa_ieemu_xslt.js and is deprecated. If you want to control XSLT transformations - * use the XSLTProcessor - * @deprecated - * @type boolean - */ +Sarissa.PARSED_EMPTY = "Document is empty"; +Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; Sarissa.IS_ENABLED_TRANSFORM_NODE = false; -/** - * tells you whether XMLHttpRequest (or equivalent) is available - * @type boolean - */ -Sarissa.IS_ENABLED_XMLHTTP = false; -/** - * tells you whether selectNodes/selectSingleNode is available - * @type boolean - */ -Sarissa.IS_ENABLED_SELECT_NODES = false; var _sarissa_iNsCounter = 0; var _SARISSA_IEPREFIX4XSLPARAM = ""; var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; +if(!window.Node || !Node.ELEMENT_NODE){ + Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; +}; -if(!window.Node || !window.Node.ELEMENT_NODE){ - var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; -}; +if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } // IE initialization if(_SARISSA_IS_IE){ @@ -76,13 +58,15 @@ // used to store the most recent ProgID available out of the above var _SARISSA_DOM_PROGID = ""; var _SARISSA_XMLHTTP_PROGID = ""; + var _SARISSA_DOM_XMLWRITER = ""; /** * Called when the Sarissa_xx.js file is parsed, to pick most recent * ProgIDs for IE, then gets destroyed. + * @private * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled */ - pickRecentProgID = function (idList, enabledList){ + Sarissa.pickRecentProgID = function (idList){ // found progID flag var bFound = false; for(var i=0; i < idList.length && !bFound; i++){ @@ -90,50 +74,69 @@ var oDoc = new ActiveXObject(idList[i]); o2Store = idList[i]; bFound = true; - for(var j=0;j"); - // don't use the same prefix again - ++_sarissa_iNsCounter; - } - else - oDoc.loadXML("<" + sName + "/>"); + // create an artifical namespace prefix + // or reuse existing prefix if applicable + var prefix = ""; + if(sUri){ + if(sName.indexOf(":") > 1){ + prefix = sName.substring(0, sName.indexOf(":")); + sName = sName.substring(sName.indexOf(":")+1); + }else{ + prefix = "a" + (_sarissa_iNsCounter++); + }; + }; + // use namespaces if a namespace URI exists + if(sUri){ + oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); + } else { + oDoc.loadXML('<' + sName + " />"); + }; }; return oDoc; }; // see non-IE version Sarissa.getParseErrorText = function (oDoc) { var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ + if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode != 0){ parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + "\nLocation: " + oDoc.parseError.url + "\nLine Number " + oDoc.parseError.line + ", Column " + @@ -144,6 +147,9 @@ parseErrorText += "-"; }; parseErrorText += "^\n"; + } + else if(oDoc.documentElement == null){ + parseErrorText = Sarissa.PARSED_EMPTY; }; return parseErrorText; }; @@ -158,43 +164,109 @@ * @constructor */ XSLTProcessor = function(){ + if(!_SARISSA_XSLTEMPLATE_PROGID){ + _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); + }; this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); this.processor = null; }; /** - * Impoprts the given XSLT DOM and compiles it to a reusable transform + * Imports the given XSLT DOM and compiles it to a reusable transform + * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those * @argument xslDoc The XSLT DOMDocument to import */ XSLTProcessor.prototype.importStylesheet = function(xslDoc){ + if(!_SARISSA_THREADEDDOM_PROGID){ + _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); + }; + xslDoc.setProperty("SelectionLanguage", "XPath"); + xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); - converted.loadXML(xslDoc.xml); + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + // make included/imported stylesheets work if exist and xsl was originally loaded from url + if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ + converted.async = false; + if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { + converted.setProperty("AllowDocumentFunction", true); + converted.resolveExternals = true; + } + converted.load(xslDoc.url); + } else { + converted.loadXML(xslDoc.xml); + }; + converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + var output = converted.selectSingleNode("//xsl:output"); + this.outputMethod = output ? output.getAttribute("method") : "html"; this.template.stylesheet = converted; this.processor = this.template.createProcessor(); - // (re)set default param values + // for getParameter and clearParameters this.paramsSet = new Array(); }; + /** - * Transform the given XML DOM + * Transform the given XML DOM and return the transformation result as a new DOM document * @argument sourceDoc The XML DOMDocument to transform * @return The transformation result as a DOM Document */ XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ - this.processor.input = sourceDoc; - var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output = outDoc; - this.processor.transform(); - return outDoc; + // fix for bug 1549749 + if(_SARISSA_THREADEDDOM_PROGID){ + this.processor.input=sourceDoc; + var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); + this.processor.output=outDoc; + this.processor.transform(); + return outDoc; + } + else{ + if(!_SARISSA_DOM_XMLWRITER){ + _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); + }; + this.processor.input = sourceDoc; + var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); + this.processor.output = outDoc; + this.processor.transform(); + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + oDoc.loadXML(outDoc.output+""); + return oDoc; + }; }; + /** - * Not sure if this works in IE. Maybe this will allow non-well-formed - * transformation results (i.e. with no single root element) + * Transform the given XML DOM and return the transformation result as a new DOM fragment. + * Note: The xsl:output method must match the nature of the owner document (XML/HTML). * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Fragment + * @argument ownerDoc The owner of the result fragment + * @return The transformation result as a DOM Document */ - XSLTProcessor.prototype.transformToFragment = function(sourceDoc, ownerDocument){ - return this.transformToDocument(sourceDoc); + XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { + this.processor.input = sourceDoc; + this.processor.transform(); + var s = this.processor.output; + var f = ownerDoc.createDocumentFragment(); + if (this.outputMethod == 'text') { + f.appendChild(ownerDoc.createTextNode(s)); + } else if (ownerDoc.body && ownerDoc.body.innerHTML) { + var container = ownerDoc.createElement('div'); + container.innerHTML = s; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + else { + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + if (s.substring(0, 5) == '') + 2); + } + var xml = ''.concat('', s, ''); + oDoc.loadXML(xml); + var container = oDoc.documentElement; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + return f; }; + /** * Set global XSLT parameter of the imported stylesheet * @argument nsURI The parameter namespace URI @@ -202,13 +274,15 @@ * @argument value The new parameter value */ XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ - /* nsURI is optional but cannot be null */ + // make value a zero length string if null to allow clearing + value = value ? value : ""; + // nsURI is optional but cannot be null if(nsURI){ this.processor.addParameter(name, value, nsURI); }else{ this.processor.addParameter(name, value); }; - /* update updated params for getParameter */ + // update updated params for getParameter if(!this.paramsSet[""+nsURI]){ this.paramsSet[""+nsURI] = new Array(); }; @@ -222,102 +296,38 @@ * @return The parameter value if reviously set by setParameter, null otherwise */ XSLTProcessor.prototype.getParameter = function(nsURI, name){ - if(this.paramsSet[""+nsURI] && this.paramsSet[""+nsURI][name]) - return this.paramsSet[""+nsURI][name]; - else + nsURI = "" + nsURI; + if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ + return this.paramsSet[nsURI][name]; + }else{ return null; + }; }; -} -else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - if(window.XMLDocument){ - /** - *

Emulate IE's onreadystatechange attribute

- */ - XMLDocument.prototype.onreadystatechange = null; - /** - *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

- *
  • 1 == LOADING,
    • - *
  • 2 == LOADED,
    • - *
  • 3 == INTERACTIVE,
    • - *
  • 4 == COMPLETED
- */ - XMLDocument.prototype.readyState = 0; - /** - *

Emulate IE's parseError attribute

- */ - XMLDocument.prototype.parseError = 0; - - // NOTE: setting async to false will only work with documents - // called over HTTP (meaning a server), not the local file system, - // unless you are using Moz 1.4+. - // BTW the try>catch block is for 1.4; I haven't found a way to check if - // the property is implemented without - // causing an error and I dont want to use user agent stuff for that... - var _SARISSA_SYNC_NON_IMPLEMENTED = false; - try{ - /** - *

Emulates IE's async property for Moz versions prior to 1.4. - * It controls whether loading of remote XML files works - * synchronously or asynchronously.

- */ - XMLDocument.prototype.async = true; - _SARISSA_SYNC_NON_IMPLEMENTED = true; - }catch(e){/* trap */}; - /** - *

Keeps a handle to the original load() method. Internal use and only - * if Mozilla version is lower than 1.4

- * @private - */ - XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; - - /** - *

Overrides the original load method to provide synchronous loading for - * Mozilla versions prior to 1.4, using an XMLHttpRequest object (if - * async is set to false)

- * @returns the DOM Object as it was before the load() call (may be empty) - */ - XMLDocument.prototype.load = function(sURI) { - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - this.parseError = 0; - Sarissa.__setReadyState__(this, 1); - try { - if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sURI, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, this); - Sarissa.__setReadyState__(this, 3); - } - else { - this._sarissa_load(sURI); - }; - } - catch (objException) { - this.parseError = -1; - } - finally { - if(this.async == false){ - Sarissa.__handleLoad__(this); - }; + /** + * Clear parameters (set them to default values as defined in the stylesheet itself) + */ + XSLTProcessor.prototype.clearParameters = function(){ + for(var nsURI in this.paramsSet){ + for(var name in this.paramsSet[nsURI]){ + if(nsURI){ + this.processor.addParameter(name, "", nsURI); + }else{ + this.processor.addParameter(name, ""); }; - return oDoc; }; - };//if(window.XMLDocument) - + }; + this.paramsSet = new Array(); + }; +}else{ /* end IE initialization, try to deal with real browsers now ;-) */ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ /** *

Ensures the document was loaded correctly, otherwise sets the * parseError to -1 to indicate something went wrong. Internal use

* @private */ Sarissa.__handleLoad__ = function(oDoc){ - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") - oDoc.parseError = -1; Sarissa.__setReadyState__(oDoc, 4); }; - /** *

Attached by an event handler to the load event. Internal use.

* @private @@ -325,7 +335,6 @@ _sarissa_XMLDocument_onload = function(){ Sarissa.__handleLoad__(this); }; - /** *

Sets the readyState property of the given DOM Document object. * Internal use.

@@ -336,80 +345,129 @@ */ Sarissa.__setReadyState__ = function(oDoc, iReadyState){ oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") oDoc.onreadystatechange(); }; - /** - *

Factory method to obtain a new DOM Document object

- * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + *

Emulate IE's onreadystatechange attribute

+ */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + *

Emulates IE's readyState property, which always gives an integer from 0 to 4:

+ *
  • 1 == LOADING,
    • + *
  • 2 == LOADED,
    • + *
  • 3 == INTERACTIVE,
    • + *
  • 4 == COMPLETED
+ */ + oDoc.readyState = 0; + }; oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); return oDoc; - }; + }; + if(window.XMLDocument){ + // do nothing + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ + //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good + /** + *

Factory method to obtain a new DOM Document object

+ * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + return oDoc; + }; + }; };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) }; //========================================== // Common stuff //========================================== if(!window.DOMParser){ - /** - * DOMParser is a utility class, used to construct DOMDocuments from XML strings - * @constructor - */ - DOMParser = function() { + if(_SARISSA_IS_SAFARI){ + /* + * DOMParser is a utility class, used to construct DOMDocuments from XML strings + * @constructor + */ + DOMParser = function() { }; + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ + DOMParser = function() { }; + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; - }; - }; -if(window.XMLHttpRequest){ - Sarissa.IS_ENABLED_XMLHTTP = true; -} -else if(_SARISSA_IS_IE){ - /** - * Emulate XMLHttpRequest - * @constructor - */ - XMLHttpRequest = function() { - return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); - }; - Sarissa.IS_ENABLED_XMLHTTP = true; -}; - -if(!window.document.importNode && _SARISSA_IS_IE){ +if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ try{ /** - * Implements importNode for the current window document in IE using innerHTML. - * Testing showed that DOM was multiple times slower than innerHTML for this, - * sorry folks. If you encounter trouble (who knows what IE does behind innerHTML) - * please gimme a call. + * Implementation of importNode for the context window document in IE. + * If oNode is a TextNode, bChildren is ignored. * @param oNode the Node to import * @param bChildren whether to include the children of oNode * @returns the imported node for further use */ - window.document.importNode = function(oNode, bChildren){ - var importNode = document.createElement("div"); - if(bChildren) - importNode.innerHTML = Sarissa.serialize(oNode); - else - importNode.innerHTML = Sarissa.serialize(oNode.cloneNode(false)); - return importNode.firstChild; + document.importNode = function(oNode, bChildren){ + var tmp; + if (oNode.nodeName=='#text') { + return document.createTextElement(oNode.data); + } + else { + if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ + tmp = document.createElement("table"); + } + else if(oNode.nodeName == "td"){ + tmp = document.createElement("tr"); + } + else if(oNode.nodeName == "option"){ + tmp = document.createElement("select"); + } + else{ + tmp = document.createElement("div"); + }; + if(bChildren){ + tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; + }else{ + tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; + }; + return tmp.getElementsByTagName("*")[0]; + }; + }; - }catch(e){}; + }catch(e){ }; }; if(!Sarissa.getParseErrorText){ /** @@ -423,17 +481,16 @@ */ Sarissa.getParseErrorText = function (oDoc){ var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ - /*moz*/ - if(oDoc.documentElement.tagName == "parsererror"){ - parseErrorText = oDoc.documentElement.firstChild.data; - parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; - }/*konq*/ - else if(oDoc.documentElement.tagName == "html"){ - parseErrorText = Sarissa.getText(oDoc.documentElement.getElementsByTagName("h1")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false); - }; + if(!oDoc.documentElement){ + parseErrorText = Sarissa.PARSED_EMPTY; + } else if(oDoc.documentElement.tagName == "parsererror"){ + parseErrorText = oDoc.documentElement.firstChild.data; + parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; + } else if(oDoc.getElementsByTagName("parsererror").length > 0){ + var parsererror = oDoc.getElementsByTagName("parsererror")[0]; + parseErrorText = Sarissa.getText(parsererror, true)+"\n"; + } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ + parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; }; return parseErrorText; }; @@ -446,8 +503,7 @@ var nodeType = node.nodeType; if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ s += node.data; - } - else if(deep == true + } else if(deep == true && (nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ @@ -456,33 +512,20 @@ }; return s; }; -if(window.XMLSerializer){ +if(!window.XMLSerializer + && Sarissa.getDomDocument + && Sarissa.getDomDocument("","foo", null).xml){ /** - *

Factory method to obtain the serialization of a DOM Node

- * @returns the serialized Node as an XML string + * Utility class to serialize DOM Node objects to XML strings + * @constructor */ - Sarissa.serialize = function(oDoc){ - return (new XMLSerializer()).serializeToString(oDoc); - }; -}else{ - if((Sarissa.getDomDocument("","foo", null)).xml){ - // see non-IE version - Sarissa.serialize = function(oDoc) { - // TODO: check for HTML document and return innerHTML instead - return oDoc.xml; - }; - /** - * Utility class to serialize DOM Node objects to XML strings - * @constructor - */ - XMLSerializer = function(){}; - /** - * Serialize the given DOM Node to an XML string - * @param oNode the DOM Node to serialize - */ - XMLSerializer.prototype.serializeToString = function(oNode) { - return oNode.xml; - }; + XMLSerializer = function(){}; + /** + * Serialize the given DOM Node to an XML string + * @param oNode the DOM Node to serialize + */ + XMLSerializer.prototype.serializeToString = function(oNode) { + return oNode.xml; }; }; @@ -497,7 +540,8 @@ * @argument oNode the Node to empty */ Sarissa.clearChildNodes = function(oNode) { - while(oNode.hasChildNodes()){ + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild) { oNode.removeChild(oNode.firstChild); }; }; @@ -510,17 +554,19 @@ * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false */ Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; var nodes = nodeFrom.childNodes; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { + if(typeof(ownerDoc.importNode) != "undefined") { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); }; - } - else{ + } else { for(var i=0;i < nodes.length;i++) { nodeTo.appendChild(nodes[i].cloneNode(true)); }; @@ -533,32 +579,34 @@ * the move operation, unless you supply a true third parameter

* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; - var nodes = nodeFrom.childNodes; // if within the same doc, just move, else copy and delete if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - nodeTo.appendChild(nodes[i]); - }else{ + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; + } else { var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } - else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; }; Sarissa.clearChildNodes(nodeFrom); }; - }; /** diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/ModPython/CandidateApp/CandidateHandler.py --- a/examples/ModPython/CandidateApp/CandidateHandler.py Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/ModPython/CandidateApp/CandidateHandler.py Sat Jul 07 16:17:29 2007 +0000 @@ -3,10 +3,10 @@ # NOTE: Path manipulation requires manual customisation. import sys -sys.path.append("/home/paulb/Software/Python/WebStack") -sys.path.append("/home/paulb/Software/Python/XSLTools") -sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") -sys.path.append("/home/paulb/Software/Python/libxml2dom") +#sys.path.append("/home/paulb/Software/Python/WebStack") +#sys.path.append("/home/paulb/Software/Python/XSLTools") +#sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") +#sys.path.append("/home/paulb/Software/Python/libxml2dom") from WebStack.Adapters import ModPython import Candidate diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/ModPython/ConfiguratorApp/ConfiguratorHandler.py --- a/examples/ModPython/ConfiguratorApp/ConfiguratorHandler.py Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/ModPython/ConfiguratorApp/ConfiguratorHandler.py Sat Jul 07 16:17:29 2007 +0000 @@ -3,10 +3,10 @@ # NOTE: Path manipulation requires manual customisation. import sys -sys.path.append("/home/paulb/Software/Python/WebStack") -sys.path.append("/home/paulb/Software/Python/XSLTools") -sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") -sys.path.append("/home/paulb/Software/Python/libxml2dom") +#sys.path.append("/home/paulb/Software/Python/WebStack") +#sys.path.append("/home/paulb/Software/Python/XSLTools") +#sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") +#sys.path.append("/home/paulb/Software/Python/libxml2dom") from WebStack.Adapters import ModPython import Configurator diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/ModPython/DictionaryApp/DictionaryHandler.py --- a/examples/ModPython/DictionaryApp/DictionaryHandler.py Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/ModPython/DictionaryApp/DictionaryHandler.py Sat Jul 07 16:17:29 2007 +0000 @@ -4,11 +4,12 @@ # NOTE: Path manipulation requires manual customisation. import sys -sys.path.append("/home/paulb/Software/Python/WebStack") -sys.path.append("/home/paulb/Software/Python/XSLTools") -sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") -sys.path.append("/home/paulb/Software/Python/libxml2dom") -filename = "/home/paulb/Software/Python/XSLTools/docs/LICENCE.txt" +#sys.path.append("/home/paulb/Software/Python/WebStack") +#sys.path.append("/home/paulb/Software/Python/XSLTools") +#sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") +#sys.path.append("/home/paulb/Software/Python/libxml2dom") +#filename = "/home/paulb/Software/Python/XSLTools/docs/LICENCE.txt" +filename = "/usr/share/doc/python2.4-xsltools/docs/gpl-3.0.txt" encoding = None from WebStack.Adapters import ModPython diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/ModPython/PEP241App/PEP241Handler.py --- a/examples/ModPython/PEP241App/PEP241Handler.py Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/ModPython/PEP241App/PEP241Handler.py Sat Jul 07 16:17:29 2007 +0000 @@ -3,10 +3,10 @@ # NOTE: Path manipulation requires manual customisation. import sys -sys.path.append("/home/paulb/Software/Python/WebStack") -sys.path.append("/home/paulb/Software/Python/XSLTools") -sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") -sys.path.append("/home/paulb/Software/Python/libxml2dom") +#sys.path.append("/home/paulb/Software/Python/WebStack") +#sys.path.append("/home/paulb/Software/Python/XSLTools") +#sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") +#sys.path.append("/home/paulb/Software/Python/libxml2dom") from WebStack.Adapters import ModPython import PEP241 diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/ModPython/QuestionnaireApp/QuestionnaireHandler.py --- a/examples/ModPython/QuestionnaireApp/QuestionnaireHandler.py Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/ModPython/QuestionnaireApp/QuestionnaireHandler.py Sat Jul 07 16:17:29 2007 +0000 @@ -3,10 +3,10 @@ # NOTE: Path manipulation requires manual customisation. import sys -sys.path.append("/home/paulb/Software/Python/WebStack") -sys.path.append("/home/paulb/Software/Python/XSLTools") -sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") -sys.path.append("/home/paulb/Software/Python/libxml2dom") +#sys.path.append("/home/paulb/Software/Python/WebStack") +#sys.path.append("/home/paulb/Software/Python/XSLTools") +#sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") +#sys.path.append("/home/paulb/Software/Python/libxml2dom") from WebStack.Adapters import ModPython import Questionnaire diff -r 86dbdc42dee5 -r 2cb1b1887117 examples/ModPython/VerySimpleApp/VerySimpleHandler.py --- a/examples/ModPython/VerySimpleApp/VerySimpleHandler.py Sun Jun 10 22:52:12 2007 +0000 +++ b/examples/ModPython/VerySimpleApp/VerySimpleHandler.py Sat Jul 07 16:17:29 2007 +0000 @@ -3,10 +3,10 @@ # NOTE: Path manipulation requires manual customisation. import sys -sys.path.append("/home/paulb/Software/Python/WebStack") -sys.path.append("/home/paulb/Software/Python/XSLTools") -sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") -sys.path.append("/home/paulb/Software/Python/libxml2dom") +#sys.path.append("/home/paulb/Software/Python/WebStack") +#sys.path.append("/home/paulb/Software/Python/XSLTools") +#sys.path.append("/home/paulb/Software/Python/XSLTools/examples/Common") +#sys.path.append("/home/paulb/Software/Python/libxml2dom") from WebStack.Adapters import ModPython import VerySimple diff -r 86dbdc42dee5 -r 2cb1b1887117 packages/ubuntu-hoary/python2.4-xsltools/debian/changelog --- a/packages/ubuntu-hoary/python2.4-xsltools/debian/changelog Sun Jun 10 22:52:12 2007 +0000 +++ b/packages/ubuntu-hoary/python2.4-xsltools/debian/changelog Sat Jul 07 16:17:29 2007 +0000 @@ -2,8 +2,11 @@ * Improved the Login module, enabling the VerySimpleWithLogin example for various frameworks. + * Relicensed under the LGPL version 3 or later. + * Upgraded to Sarissa 0.9.7.8 (compatible with LGPL/GPL + version 3). - -- Paul Boddie Mon, 11 Jun 2007 00:51:43 +0200 + -- Paul Boddie Sat, 7 Jul 2007 18:16:51 +0200 xsltools (0.4.5-0ubuntu1) hoary; urgency=low diff -r 86dbdc42dee5 -r 2cb1b1887117 packages/ubuntu-hoary/python2.4-xsltools/debian/copyright --- a/packages/ubuntu-hoary/python2.4-xsltools/debian/copyright Sun Jun 10 22:52:12 2007 +0000 +++ b/packages/ubuntu-hoary/python2.4-xsltools/debian/copyright Sat Jul 07 16:17:29 2007 +0000 @@ -17,28 +17,28 @@ Copyright (C) 2005, 2006, 2007 Paul Boddie -This library 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 Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +This program 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 Free +Software Foundation; either version 3 of the License, or (at your option) any +later version. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +You should have received a copy of the GNU Lesser General Public License along +with this program. If not, see . Copyright and Licensing Information for Other Software ------------------------------------------------------ Certain examples in XSLTools use files from the Sarissa distribution (see http://sarissa.sourceforge.net). These files were made available under the GNU -Lesser General Public License and under the GNU General Public License; the -former licence is identical to that found in the LICENCE.txt file, whereas the -latter can be found in the LICENCE-Sarissa.txt file. +Lesser General Public License (version 2.1 or later) and under the GNU General +Public License (version 2 or later); the former licence is found in the +LICENCE-Sarissa-lgpl.txt file, whereas the latter is found in the +LICENCE-Sarissa-gpl.txt file. The XMLTools.XMLCalendar module uses a modified version of the monthcalendar function from the Python standard library's calendar module. This code was