Bug 248044 move jar protocol handler into libjar. these are the changes to the

existing files r=bsmedberg sr=darin
2004-09-14 18:40:26 +00:00 · 2004-09-14 18:40:26 +00:00 · 1d61416f70
--- a/Makefile.in
+++ b/Makefile.in
@ -157,7 +157,6 @@ endif
 tier_9_dirs += \
 		js/src/xpconnect \
 		intl \
-		modules/libjar \
 		$(NULL)

 ifdef MOZ_OJI
@ -186,6 +185,7 @@ endif
 tier_9_dirs	+= \
 		modules/libutil \
 		netwerk \
+		modules/libjar \
 		uriloader \
 		modules/libpref \
 		modules/libimg \
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@ -426,9 +426,6 @@ netwerk/protocol/gopher/src/Makefile
 netwerk/protocol/http/Makefile
 netwerk/protocol/http/public/Makefile
 netwerk/protocol/http/src/Makefile
-netwerk/protocol/jar/Makefile
-netwerk/protocol/jar/public/Makefile
-netwerk/protocol/jar/src/Makefile
 netwerk/protocol/keyword/Makefile
 netwerk/protocol/keyword/src/Makefile
 netwerk/protocol/res/Makefile
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@ -122,7 +122,6 @@ bin/components/necko_dns.xpt
 bin/components/necko_file.xpt
 bin/components/necko_ftp.xpt
 bin/components/necko_http.xpt
-bin/components/necko_jar.xpt
 bin/components/necko_res.xpt
 bin/components/necko_socket.xpt
 bin/components/necko_strconv.xpt
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@ -126,7 +126,6 @@ bin\components\necko_dns.xpt
 bin\components\necko_file.xpt
 bin\components\necko_ftp.xpt
 bin\components\necko_http.xpt
-bin\components\necko_jar.xpt
 bin\components\necko_res.xpt
 bin\components\necko_viewsource.xpt
 bin\components\oji.xpt
--- a/calendar/installer/windows/packages-static
+++ b/calendar/installer/windows/packages-static
@ -126,7 +126,6 @@ bin\components\necko_dns.xpt
 bin\components\necko_file.xpt
 bin\components\necko_ftp.xpt
 bin\components\necko_http.xpt
-bin\components\necko_jar.xpt
 bin\components\necko_res.xpt
 bin\components\necko_viewsource.xpt
 ;!4sunbird bin\components\oji.xpt
--- a/configure.in
+++ b/configure.in
@ -5418,7 +5418,7 @@ dnl ========================================================
 dnl
 dnl option to disable various necko protocols
 dnl
-NECKO_PROTOCOLS_DEFAULT="about data file ftp gopher http jar keyword res viewsource"
+NECKO_PROTOCOLS_DEFAULT="about data file ftp gopher http keyword res viewsource"
 MOZ_ARG_ENABLE_STRING(necko-protocols,
 [  --enable-necko-protocols[={http,ftp,default,all,none}]
                          Enable/disable specific protocol handlers],
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -77,6 +77,7 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  rdf \
 		  xultmpl \
+		  jar \
 		  $(NULL)

 ifdef NS_TRACE_MALLOC
--- a/embedding/config/basebrowser-installer-win.pkg
+++ b/embedding/config/basebrowser-installer-win.pkg
@ -192,7 +192,6 @@ components\necko_about.xpt
 components\necko_data.xpt               
 components\necko_dns.xpt                
 components\necko_http.xpt               
-components\necko_jar.xpt                
 components\necko_res.xpt                
 components\necko_strconv.xpt

--- a/embedding/config/basebrowser-mac-macho
+++ b/embedding/config/basebrowser-mac-macho
@ -117,7 +117,6 @@ components/necko_data.xpt
 components/necko_dns.xpt                
 components/necko_ftp.xpt                
 components/necko_http.xpt               
-components/necko_jar.xpt                
 components/necko_res.xpt                
 components/necko_strconv.xpt            

--- a/embedding/config/basebrowser-qnx
+++ b/embedding/config/basebrowser-qnx
@ -171,7 +171,6 @@ components/necko_about.xpt
 components/necko_data.xpt               
 components/necko_dns.xpt                
 components/necko_http.xpt               
-components/necko_jar.xpt                
 components/necko_res.xpt                
 components/necko_strconv.xpt

--- a/embedding/config/basebrowser-unix
+++ b/embedding/config/basebrowser-unix
@ -172,7 +172,6 @@ components/necko_about.xpt
 components/necko_data.xpt               
 components/necko_dns.xpt                
 components/necko_http.xpt               
-components/necko_jar.xpt                
 components/necko_res.xpt                
 components/necko_strconv.xpt

--- a/embedding/config/basebrowser-win
+++ b/embedding/config/basebrowser-win
@ -200,7 +200,6 @@ components\necko_data.xpt
 components\necko_dns.xpt                
 components\necko_ftp.xpt
 components\necko_http.xpt               
-components\necko_jar.xpt                
 components\necko_res.xpt                
 components\necko_strconv.xpt

--- a/embedding/config/minimo-qnx
+++ b/embedding/config/minimo-qnx
@ -140,7 +140,6 @@ components/necko_about.xpt
 components/necko_data.xpt               
 components/necko_dns.xpt                
 components/necko_http.xpt               
-components/necko_jar.xpt                
 components/necko_res.xpt                
 components/necko_strconv.xpt

--- a/embedding/config/minimo-unix
+++ b/embedding/config/minimo-unix
@ -138,7 +138,6 @@ components/necko_about.xpt
 components/necko_data.xpt               
 components/necko_dns.xpt                
 components/necko_http.xpt               
-components/necko_jar.xpt                
 components/necko_res.xpt                
 components/necko_strconv.xpt

--- a/mail/config/basemail-os2
+++ b/mail/config/basemail-os2
@ -248,7 +248,6 @@ components\necko.xpt
 components\necko_data.xpt               
 components\necko_dns.xpt                
 components\necko_http.xpt               
-components\necko_jar.xpt                
 components\necko_res.xpt                
 components\necko_strconv.xpt
 components\necko_file.xpt
--- a/mail/config/basemail-unix
+++ b/mail/config/basemail-unix
@ -300,7 +300,6 @@ components/necko_about.xpt
 components/necko_data.xpt               
 components/necko_dns.xpt                
 components/necko_http.xpt               
-components/necko_jar.xpt                
 components/necko_res.xpt                
 components/necko_strconv.xpt
 components/necko_viewsource.xpt
--- a/mail/installer/windows/basemail-win
+++ b/mail/installer/windows/basemail-win
@ -248,7 +248,6 @@ bin\components\necko.xpt
 bin\components\necko_data.xpt               
 bin\components\necko_dns.xpt                
 bin\components\necko_http.xpt               
-bin\components\necko_jar.xpt                
 bin\components\necko_res.xpt                
 bin\components\necko_strconv.xpt
 bin\components\necko_file.xpt
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@ -67,6 +67,12 @@ PACKAGE_FILE = libjar.pkg
 REQUIRES	= xpcom \
 		  string \
 		  caps \
+			mimetype \
+			js \
+			pref \
+			xpconnect \
+			uconv \
+			necko \
 		  $(ZLIB_REQUIRES) \
 		  $(NULL)

--- a/modules/libjar/nsJARFactory.cpp
+++ b/modules/libjar/nsJARFactory.cpp
@ -55,12 +55,14 @@
 #include "nsIJARFactory.h"
 #include "nsRecyclingAllocator.h"
 #include "nsXPTZipLoader.h"
+#include "nsJARProtocolHandler.h"

 extern nsRecyclingAllocator *gZlibAllocator;

 NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPTZipLoader)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAR)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsZipReaderCache)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsJARProtocolHandler, Init)

 // The list of components we register
 static const nsModuleComponentInfo components[] = 
@ -79,6 +81,11 @@ static const nsModuleComponentInfo components[] =
       NS_ZIPREADERCACHE_CID,
      "@mozilla.org/libjar/zip-reader-cache;1", 
      nsZipReaderCacheConstructor
+    },
+    { NS_JARPROTOCOLHANDLER_CLASSNAME,
+      NS_JARPROTOCOLHANDLER_CID,
+      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "jar", 
+      nsJARProtocolHandlerConstructor
    }
 };

--- a/modules/libjar/objs.mk
+++ b/modules/libjar/objs.mk
@ -46,6 +46,9 @@ MODULES_LIBJAR_LCPPSRCS = \
 		nsJAR.cpp \
 		nsJARFactory.cpp \
 		nsXPTZipLoader.cpp \
+		nsJARProtocolHandler.cpp \
+		nsJARChannel.cpp  \
+		nsJARURI.cpp  \
 		$(NULL)

 MODULES_LIBJAR_LEXPORTS = \
@ -57,6 +60,9 @@ MODULES_LIBJAR_LEXPORTS = \
 MODULES_LIBJAR_LXPIDLSRCS = \
 		nsIZipReader.idl \
 		nsIJAR.idl \
+		nsIJARChannel.idl \
+		nsIJARURI.idl \
+		nsIJARProtocolHandler.idl \
 		$(NULL)

 MODULES_LIBJAR_CPPSRCS := $(addprefix $(topsrcdir)/modules/libjar/, $(MODULES_LIBJAR_LCPPSRCS))
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -61,7 +61,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  mimetype \
 		  util \
-		  jar \
 		  locale \
 		  intl \
 		  uconv \
@ -74,7 +73,7 @@ CPPSRCS		= nsNetModule.cpp
 EXPORTS		= nsNetCID.h

 # core necko protocols (about:blank is mandatory)
-PROTOCOLS = $(filter file ftp http jar res,$(NECKO_PROTOCOLS))
+PROTOCOLS = $(filter file ftp http res,$(NECKO_PROTOCOLS))

 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
--- a/netwerk/build/necko.pkg
+++ b/netwerk/build/necko.pkg
@ -11,7 +11,6 @@ dist/bin/components/@SHARED_LIBRARY@
 !xpt dist/bin/components/necko_file.xpt
 !xpt dist/bin/components/necko_ftp.xpt
 !xpt dist/bin/components/necko_http.xpt
-!xpt dist/bin/components/necko_jar.xpt
 !xpt dist/bin/components/necko_res.xpt
 !xpt dist/bin/components/necko_strconv.xpt
 !xpt dist/bin/components/necko_cache.xpt
--- a/netwerk/build/nsNetCID.h
+++ b/netwerk/build/nsNetCID.h
@ -565,20 +565,6 @@
    {0xa1, 0x78, 0x00, 0x50, 0x04, 0x1c, 0xaf, 0x44} \
 }

-/******************************************************************************
- * netwerk/protocol/jar/ classes
- */
-
-#define NS_JARPROTOCOLHANDLER_CLASSNAME \
-    "nsJarProtocolHandler"
-#define NS_JARPROTOCOLHANDLER_CID                    \
-{ /* 0xc7e410d4-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d4,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
 /******************************************************************************
 * netwerk/protocol/viewsource/ classes
 */
--- a/netwerk/build/nsNetModule.cpp
+++ b/netwerk/build/nsNetModule.cpp
@ -191,12 +191,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpBasicAuth)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpDigestAuth)
 #endif // !NECKO_PROTOCOL_http
  
-#ifdef NECKO_PROTOCOL_jar
-// jar
-#include "nsJARProtocolHandler.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsJARProtocolHandler, Init)
-#endif
-  
 #ifdef NECKO_PROTOCOL_res
 // resource
 #include "nsResProtocolHandler.h"
@ -926,15 +920,6 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
    },
 #endif

-#ifdef NECKO_PROTOCOL_jar
-    // from netwerk/protocol/jar:
-    { NS_JARPROTOCOLHANDLER_CLASSNAME,
-      NS_JARPROTOCOLHANDLER_CID,
-      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "jar", 
-      nsJARProtocolHandlerConstructor
-    },
-#endif
-
 #ifdef NECKO_PROTOCOL_res
    // from netwerk/protocol/res:
    { NS_RESPROTOCOLHANDLER_CLASSNAME,
--- a/netwerk/necko-config.h.in
+++ b/netwerk/necko-config.h.in
@ -49,7 +49,6 @@
 #undef NECKO_PROTOCOL_ftp
 #undef NECKO_PROTOCOL_gopher
 #undef NECKO_PROTOCOL_http
-#undef NECKO_PROTOCOL_jar
 #undef NECKO_PROTOCOL_keyword
 #undef NECKO_PROTOCOL_res
 #undef NECKO_PROTOCOL_viewsource
--- a/netwerk/protocol/Makefile.in
+++ b/netwerk/protocol/Makefile.in
@ -47,7 +47,6 @@ DIRS		= about \
              keyword \
              res \
              file \
-              jar \
              http \
              viewsource \
              ftp \
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@ -177,7 +177,6 @@ bin/components/necko_data.xpt
 bin/components/necko_dns.xpt
 bin/components/necko_ftp.xpt
 bin/components/necko_http.xpt
-bin/components/necko_jar.xpt
 bin/components/necko_res.xpt
 bin/components/necko_cookie.xpt
 bin/components/necko_file.xpt
--- a/xpinstall/packager/packages-static-unix
+++ b/xpinstall/packager/packages-static-unix
@ -130,7 +130,6 @@ bin/components/necko_data.xpt
 bin/components/necko_dns.xpt
 bin/components/necko_ftp.xpt
 bin/components/necko_http.xpt
-bin/components/necko_jar.xpt
 bin/components/necko_res.xpt
 bin/components/necko_socket.xpt
 bin/components/nsFilePicker.js
--- a/xpinstall/packager/packages-static-win
+++ b/xpinstall/packager/packages-static-win
@ -150,7 +150,6 @@ bin\components\necko_data.xpt
 bin\components\necko_dns.xpt
 bin\components\necko_ftp.xpt
 bin\components\necko_http.xpt
-bin\components\necko_jar.xpt
 bin\components\necko_res.xpt
 bin\components\nsSidebar.js
 bin\components\oji.xpt
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@ -175,7 +175,6 @@ bin/components/necko_data.xpt
 bin/components/necko_dns.xpt
 bin/components/necko_ftp.xpt
 bin/components/necko_http.xpt
-bin/components/necko_jar.xpt
 bin/components/necko_res.xpt
 bin/components/necko_socket.xpt
 bin/components/necko_cookie.xpt