Fix for bug 336244 (Clean up/remove extensions/xmlextras/base). r/sr=sicking.

2006-05-21 19:50:16 +00:00 · 2006-05-21 19:50:16 +00:00 · 3869989ccb
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@ -1344,9 +1344,6 @@ fi
 if [ "$MOZ_XMLEXTRAS" ]; then
    MAKEFILES_content="$MAKEFILES_content
        extensions/xmlextras/Makefile
-        extensions/xmlextras/base/Makefile
-        extensions/xmlextras/base/src/Makefile
-        extensions/xmlextras/base/public/Makefile
        extensions/xmlextras/pointers/Makefile
        extensions/xmlextras/pointers/src/Makefile
        extensions/xmlextras/build/Makefile
--- a/browser/components/bookmarks/src/Makefile.in
+++ b/browser/components/bookmarks/src/Makefile.in
@ -61,7 +61,6 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  unicharutil \
 		  txmgr \
-		  xmlextras \
 		  caps \
 		  xpconnect \
 		  js \
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@ -67,7 +67,6 @@ REQUIRES = xpcom \
           htmlparser \
           content \
           txmgr \
-           xmlextras \
           caps \
           xpconnect \
           js \
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@ -162,7 +162,6 @@ bin/components/websrvcs.xpt
 bin/components/widget.xpt
 bin/components/windowds.xpt
 bin/components/windowwatcher.xpt
-bin/components/xmlextras.xpt
 bin/components/xml-rpc.xpt
 bin/components/xpcom_base.xpt
 bin/components/xpcom_components.xpt
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@ -177,7 +177,6 @@ bin\components\windowds.xpt
 bin\components\windowwatcher.xpt
 bin\components\shellservice.xpt
 bin\components\xml-rpc.xpt
-bin\components\xmlextras.xpt
 bin\components\xpcom_base.xpt
 bin\components\xpcom_components.xpt
 bin\components\xpcom_ds.xpt
--- a/configure.in
+++ b/configure.in
@ -5331,7 +5331,7 @@ dnl ========================================================
 dnl XMLExtras
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(xmlextras,
-[  --disable-xmlextras Disable XMLExtras such as XMLHttpRequest ],
+[  --disable-xmlextras Disable XMLExtras such as XPointer support ],
    MOZ_XMLEXTRAS=,
    MOZ_XMLEXTRAS=1 )

--- a/embedding/config/basebrowser-installer-win.pkg
+++ b/embedding/config/basebrowser-installer-win.pkg
@ -227,9 +227,8 @@ freebl3.dll
 ssl3.dll
 nssckbi.dll

-; xmlextras, optional for XMLHttpRequest support
+; xmlextras, optional for XPointer support
 components\xmlextras.dll
-components\xmlextras.xpt

 ; 
 ; res:
--- a/embedding/config/basebrowser-mac-macho
+++ b/embedding/config/basebrowser-mac-macho
@ -207,9 +207,8 @@ components/libwidget_mac.dylib
 components/widget.xpt
 libwidget.rsrc

-; xmlextras, optional for XMLHttpRequest support
+; xmlextras, optional for XPointer support
 components/libxmlextras.dylib
-components/xmlextras.xpt

 ; xpconnect
 components/libxpconnect.dylib
--- a/embedding/config/basebrowser-qnx
+++ b/embedding/config/basebrowser-qnx
@ -212,9 +212,8 @@ libfreebl3.so
 libssl3.so
 libnssckbi.so

-; xmlextras, optional for XMLHttpRequest support
+; xmlextras, optional for XPointer support
 components/libxmlextras.so
-components/xmlextras.xpt

 res/language.properties
 res/langGroups.properties
--- a/embedding/config/basebrowser-unix
+++ b/embedding/config/basebrowser-unix
@ -213,9 +213,8 @@ libfreebl3.so
 libssl3.so
 libnssckbi.so

-; xmlextras, optional for XMLHttpRequest support
+; xmlextras, optional for XPointer support
 components/libxmlextras.so
-components/xmlextras.xpt

 res/language.properties
 res/langGroups.properties
--- a/embedding/config/basebrowser-win
+++ b/embedding/config/basebrowser-win
@ -245,9 +245,8 @@ freebl3.dll
 ssl3.dll
 nssckbi.dll

-; xmlextras, optional for XMLHttpRequest support
+; xmlextras, optional for XPointer support
 components\xmlextras.dll
-components\xmlextras.xpt

 ; 
 ; res:
--- a/embedding/config/gre-installer-win.pkg
+++ b/embedding/config/gre-installer-win.pkg
@ -71,7 +71,6 @@ components\webbrowserpersist.xpt
 ; xml
 ;
 components\xmlextras.dll
-components\xmlextras.xpt

 ;
 ; XP Install Support
--- a/embedding/config/gre-win
+++ b/embedding/config/gre-win
@ -59,7 +59,6 @@ components\webbrowserpersist.xpt
 ; xml
 ;
 components\xmlextras.dll
-components\xmlextras.xpt

 ;
 ; XP Install Support
--- a/extensions/webdav/Makefile.in
+++ b/extensions/webdav/Makefile.in
@ -45,11 +45,7 @@ VPATH            = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= webdav
-DIRS            =
-ifeq (,$(filter xmlextras,$(MOZ_EXTENSIONS)))
-DIRS            += ../xmlextras
-endif
-DIRS            += public src
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk

--- a/extensions/webservices/docs/Soap_Scripts_in_Mozilla.html
+++ b/extensions/webservices/docs/Soap_Scripts_in_Mozilla.html
@ -1398,7 +1398,7 @@ Attachments").<br>
        <h2><a name="5_Samples_and_Testing"></a>
    5&nbsp;Samples and Testing</h2>
  Tests and samples exist today can be found in the mozilla tree at <a  
-  href=http://lxr.mozilla.org/seamonkey/source/extensions/xmlextras/tests/>
+  href=http://lxr.mozilla.org/seamonkey/source/extensions/webservices/soap/tests/>
  mozilla/extensions/xmlextras/tests/soap*.html</a>. &nbsp;We welcome the
 contribution of tests and samples by other parties.  Please note that
 these files do not work in the linked location due to js files being shown 
--- a/extensions/webservices/interfaceinfo/readme.html
+++ b/extensions/webservices/interfaceinfo/readme.html
@ -1,6 +1,6 @@
 <html>
 <body>
-mozilla/extensions/xmlextras/interfaceinfo implements:
+mozilla/extensions/webservices/interfaceinfo implements:
 <ul>
 <li>generic scriptable wrappers for interface infos
 <li>dynamically populatable interface info set support
--- a/extensions/xforms/Makefile.in
+++ b/extensions/xforms/Makefile.in
@ -100,7 +100,6 @@ REQUIRES	= \
 		widget \
 		necko \
 		websrvcs \
-		xmlextras \
 		docshell \
 		mimetype \
 		caps \
--- a/extensions/xmlextras/base/.cvsignore
+++ b/extensions/xmlextras/base/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/extensions/xmlextras/base/Makefile.in
+++ b/extensions/xmlextras/base/Makefile.in
@ -1,47 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH           = ../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS            = public src
-
-include $(topsrcdir)/config/rules.mk
--- a/extensions/xmlextras/build/src/xmlextras.pkg
+++ b/extensions/xmlextras/build/src/xmlextras.pkg
@ -4,7 +4,6 @@ dist/bin/components/@SHARED_LIBRARY@
 #else
 !staticcomp @LIBRARY@ @MODULE_NAME@
 #endif
-!xpt dist/bin/components/xmlextras.xpt

 #if ENABLE_TESTS
 [gecko-tests]
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@ -253,7 +253,6 @@ bin/components/nsProxyAutoConfig.js
 bin/components/nsXmlRpcClient.js
 ;bin/plugins/npnul32.dll
 bin/plugins/npnulos2.dll
-bin/components/xmlextras.xpt
 ;bin/components/xmlextras.dll
 bin/components/xmlextra.dll
 bin/components/nsHelperAppDlg.js
--- a/xpinstall/packager/packages-static-unix
+++ b/xpinstall/packager/packages-static-unix
@ -183,7 +183,6 @@ bin/components/embed_base.xpt
 bin/components/commandhandler.xpt
 bin/components/webbrowserpersist.xpt
 bin/components/windowwatcher.xpt
-bin/components/xmlextras.xpt
 bin/components/nsHelperAppDlg.js
 bin/components/helperAppDlg.xpt
 bin/components/nsProgressDialog.js
--- a/xpinstall/packager/packages-static-win
+++ b/xpinstall/packager/packages-static-win
@ -189,7 +189,6 @@ bin\components\xml-rpc.xpt
 bin\components\nsDictionary.js
 bin\components\nsProxyAutoConfig.js
 bin\components\nsXmlRpcClient.js
-bin\components\xmlextras.xpt
 bin\components\nsHelperAppDlg.js
 bin\components\helperAppDlg.xpt
 bin\components\nsKillAll.js
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@ -245,7 +245,6 @@ bin/components/embed_base.xpt
 bin/components/commandhandler.xpt
 bin/components/webbrowserpersist.xpt
 bin/components/windowwatcher.xpt
-bin/components/xmlextras.xpt
 bin/components/libxmlextras.so
 bin/components/nsHelperAppDlg.js
 bin/components/helperAppDlg.xpt