[Net] Remove TNetFile and TNetFileStager, update documentation

README/ReleaseNotes/v640/index.md

@@ -17,6 +17,7 @@ The following people have contributed to this new version:
  Olivier Couet, CERN/EP-SFT,\
  Marta Czurylo, CERN/EP-SFT,\
  Florine de Geus, CERN/EP-SFT and University of Twente,\
+ Ned Ganchovski, Proektsoft EOOD,\
  Andrei Gheata, CERN/EP-SFT,\
  Jonas Hahnfeld, CERN/EP-SFT and Goethe University Frankfurt,\
  Fernando Hueso Gonzalez, IFIC (CSIC-University of Valencia),\
@@ -29,11 +30,11 @@ The following people have contributed to this new version:
  Giacomo Parolini, CERN/EP-SFT,\
  Danilo Piparo, CERN/EP-SFT,\
  Jonas Rembser, CERN/EP-SFT,\
+ Sebastian Alba Vives, Instituto Tecnologico de Costa Rica (TEC),\
  Silia Taider, CERN/EP-SFT,\
  Devajith Valaparambil Sreeramaswamy, CERN/EP-SFT,\
  Vassil Vassilev, Princeton,\
  Sandro Wenzel, CERN/EP-ALICE,\
- Ned Ganchovski, Proektsoft EOOD,\
 
 ## Deprecations
 
@@ -70,6 +71,7 @@ The following people have contributed to this new version:
   }
   ```
 * The `compression_default` build option was removed. It was supposed to change the default compression algorithm, but didn't actually work with the default parameters of `TFile`.
+* The `TNetFile` and `TNetFileStager` classes were removed: they depended on `rootd` removed in release 6.16.00.
 
 ## Build System
 

config/mimes.unix.in

@@ -161,7 +161,7 @@ icon = rootdb_s.xpm rootdb_t.xpm
 action = THbookFile *ftmp = new THbookFile("%s")
 
 [root/tfile]
-pattern = TFile TNetFile TWebFile
+pattern = TFile TWebFile
 icon = rootdb_s.xpm rootdb_t.xpm
 action = ->Browse()
 

config/mimes.win32.in

@@ -161,7 +161,7 @@ icon = rootdb_s.xpm rootdb_t.xpm
 action = THbookFile *ftmp = new THbookFile("%s")
 
 [root/tfile]
-pattern = TFile TNetFile TWebFile
+pattern = TFile TWebFile
 icon = rootdb_s.xpm rootdb_t.xpm
 action = ->Browse()
 

config/rootrc.in

@@ -436,7 +436,7 @@ RSA.KeyType:  1
 # UsrPwd: check of host equivalence via /etc/hosts.equiv or $HOME/.rhosts.
 #SrvAuth.CheckHostsEquivalence: 1
 
-# Force file opening via TNetFile (TNetXNGFile) if a hostname is specified
+# Force file opening via TNetXNGFile if a hostname is specified
 # in the Url.
 # By default, for local files TFile::Open() invokes directly TFile
 #TFile.ForceRemote:  yes

io/dcache/src/TDCacheFile.cxx

@@ -240,7 +240,7 @@ Bool_t TDCacheFile::ReadBuffer(char *buf, Long64_t pos, Int_t len)
 /// Read the nbuf blocks described in arrays pos and len,
 /// where pos[i] is the seek position of block i of length len[i].
 /// Note that for nbuf=1, this call is equivalent to TFile::ReafBuffer.
-/// This function is overloaded by TNetFile, TWebFile, etc.
+/// This function is overloaded by TWebFile etc.
 /// Returns kTRUE in case of failure.
 
 Bool_t TDCacheFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)

io/io/src/TFile.cxx

@@ -1868,7 +1868,7 @@ Bool_t TFile::ReadBuffer(char *buf, Int_t len)
 ///
 /// The value pos[i] is the seek position of block i of length len[i].
 /// Note that for nbuf=1, this call is equivalent to TFile::ReafBuffer.
-/// This function is overloaded by TNetFile, TWebFile, etc.
+/// This function is overloaded by TWebFile etc.
 /// Returns kTRUE in case of failure.
 
 Bool_t TFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)
@@ -2256,7 +2256,7 @@ Int_t TFile::ReOpen(Option_t *mode)
       }
 
       // open in READ mode
-      fOption = opt;    // set fOption before SysOpen() for TNetFile
+      fOption = opt;    // was setting fOption before SysOpen() for the old TNetFile
 #ifndef WIN32
       fD = SysOpen(fRealName, O_RDONLY, 0666);
 #else
@@ -2278,7 +2278,7 @@ Int_t TFile::ReOpen(Option_t *mode)
       }
 
       // open in UPDATE mode
-      fOption = opt;    // set fOption before SysOpen() for TNetFile
+      fOption = opt;    // was setting fOption before SysOpen() for the old TNetFile
 #ifndef WIN32
       fD = SysOpen(fRealName, O_RDWR | O_CREAT, 0666);
 #else
@@ -3751,24 +3751,19 @@ TFile *TFile::OpenFromCache(const char *name, Option_t *, const char *ftitle,
 /// Create / open a file
 ///
 /// The type of the file can be either a
-/// TFile, TNetFile, TWebFile or any TFile derived class for which an
+/// TFile, TWebFile or any TFile derived class for which an
 /// plugin library handler has been registered with the plugin manager
 /// (for the plugin manager see the TPluginManager class). The returned
 /// type of TFile depends on the file name specified by 'url'.
 /// If 'url' is a '|'-separated list of file URLs, the 'URLs' are tried
 /// sequentially in the specified order until a successful open.
-/// If the file starts with "root:", "roots:" or "rootk:" a TNetFile object
+/// If the file starts with "root:" a TNetXNGFile object
 /// will be returned, with "http:" a TWebFile, with "file:" a local TFile,
 /// etc. (see the list of TFile plugin handlers in $ROOTSYS/etc/system.rootrc
 /// for regular expressions that will be checked) and as last a local file will
 /// be tried.
-/// Before opening a file via TNetFile a check is made to see if the URL
-/// specifies a local file. If that is the case the file will be opened
-/// via a normal TFile. To force the opening of a local file via a
-/// TNetFile use either TNetFile directly or specify as host "localhost".
-/// The netopt argument is only used by TNetFile. For the meaning of the
-/// options and other arguments see the constructors of the individual
-/// file classes. In case of error, it returns a nullptr.
+/// For the meaning of the options and other arguments see the constructors 
+/// of the individual file classes. In case of error, it returns a nullptr.
 ///
 /// For TFile implementations supporting asynchronous file open, see
 /// TFile::AsyncOpen(...), it is possible to request a timeout with the
@@ -3984,11 +3979,7 @@ TFile *TFile::Open(const char *url, Option_t *options, const char *ftitle,
             if ((h = gROOT->GetPluginManager()->FindHandler("TFile", name.Data()))) {
                if (h->LoadPlugin() == -1)
                   return nullptr;
-               TClass *cl = TClass::GetClass(h->GetClass());
-               if (cl && cl->InheritsFrom("TNetFile"))
-                  f = (TFile*) h->ExecPlugin(5, name.Data(), option, ftitle, compress, netopt);
-               else
-                  f = (TFile*) h->ExecPlugin(4, name.Data(), option, ftitle, compress);
+               f = (TFile*) h->ExecPlugin(4, name.Data(), option, ftitle, compress);
             } else {
                // Just try to open it locally but via TFile::Open, so that we pick-up the correct
                // plug-in in the case file name contains information about a special backend (e.g.)

io/io/src/TFileCacheRead.cxx

@@ -19,7 +19,7 @@
  no operating system caching support (like the buffer cache for
  local disk I/O). The cache makes sure that every I/O is done with
  a (large) fixed length buffer thereby avoiding many small I/O's.
- Currently the read cache system is used by the classes TNetFile,
+ Currently the read cache system is used by the classes
  TNetXNGFile and TWebFile (via TFile::ReadBuffers()).
  When processing TTree, TChain, a specialized class TTreeCache that
  derives from this class is automatically created.

io/io/src/TFileCacheWrite.cxx

@@ -18,7 +18,7 @@ A caching system to speed up network I/O, i.e. when there is
 no operating system caching support (like the buffer cache for
 local disk I/O). The cache makes sure that every I/O is done with
 a (large) fixed length buffer thereby avoiding many small I/O's.
-Currently the write cache system is used by the classes TNetFile,
+Currently the write cache system is used by the classes
 TNetXNGFile and TWebFile (via TFile::WriteBuffers()).
 
 The write cache is automatically created when writing a remote file

net/CMakeLists.txt

@@ -7,10 +7,6 @@
 add_subdirectory(net)
 add_subdirectory(auth)
 
-if(NOT WIN32 AND ssl)
-  add_subdirectory(rpdutils)
-endif()
-
 if(davix)
    add_subdirectory(davix)
 endif()

net/auth/src/TAuthenticate.cxx

@@ -13,7 +13,7 @@
 //                                                                      //
 // TAuthenticate                                                        //
 //                                                                      //
-// An authentication module for ROOT based network services, like rootd //                                                       //
+// An authentication module for ROOT based network services, like rootd //
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
@@ -24,7 +24,6 @@
 #include "THostAuth.h"
 #include "TRootSecContext.h"
 #include "TPluginManager.h"
-#include "TNetFile.h"
 #include "TPSocket.h"
 #include "TMessage.h"
 #include "TSystem.h"

net/net/CMakeLists.txt

@@ -46,8 +46,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
     TGridResult.h
     TMessage.h
     TMonitor.h
-    TNetFile.h
-    TNetFileStager.h
     TParallelMergingFile.h
     TPServerSocket.h
     TPSocket.h
@@ -78,8 +76,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
     src/TGridResult.cxx
     src/TMessage.cxx
     src/TMonitor.cxx
-    src/TNetFile.cxx
-    src/TNetFileStager.cxx
     src/TParallelMergingFile.cxx
     src/TPServerSocket.cxx
     src/TPSocket.cxx

net/net/inc/LinkDef.h

@@ -26,8 +26,6 @@
 #pragma link C++ class TPSocket;
 #pragma link C++ class TMessage;
 #pragma link C++ class TMonitor;
-#pragma link C++ class TNetFile;
-#pragma link C++ class TNetFileStager;
 #pragma link C++ class TNetSystem;
 #pragma link C++ class TWebFile;
 #pragma link C++ class TWebSystem;