Merge pull request #47977 from makortel/remoteObsoleteStorage

Remove support for gsiftp:, sfn:, storm:, storm-lcg:, and lstore: protocols as obsolete

Author: cmsbuild

IOPool/TFileAdaptor/src/TFileAdaptor.cc

@@ -25,8 +25,8 @@
 /**
    Register TFileAdaptor to be the handler for a given type.
 
-   Once registered, URLs matching a specified regexp (for example, ^lstore: to
-   manage files starting with lstore://) will be managed by a TFileAdaptor instance,
+   Once registered, URLs matching a specified regexp (for example, ^root: to
+   manage files starting with root://) will be managed by a TFileAdaptor instance,
    possibly overriding any built-in ROOT adaptors.
 
    @param[in] mgr      The ROOT plugin manager object.
@@ -180,20 +180,12 @@ TFileAdaptor::TFileAdaptor(edm::ParameterSet const& pset, edm::ActivityRegistry&
   if (!native("ftp"))
     addType(mgr, "^ftp:");
   /* always */ addType(mgr, "^web:");
-  /* always */ addType(mgr, "^gsiftp:");
-  /* always */ addType(mgr, "^sfn:");
   if (!native("dcache"))
     addType(mgr, "^dcache:");
   if (!native("dcap"))
     addType(mgr, "^dcap:");
   if (!native("gsidcap"))
     addType(mgr, "^gsidcap:");
-  if (!native("storm"))
-    addType(mgr, "^storm:");
-  if (!native("storm-lcg"))
-    addType(mgr, "^storm-lcg:");
-  if (!native("lstore"))
-    addType(mgr, "^lstore:");
   if (!native("root"))
     addType(mgr, "^root:", 1);  // See comments in addType
   if (!native("root"))

IOPool/TFileAdaptor/test/tfileTest.cpp

@@ -18,32 +18,16 @@
 
 int main(int argc, char* argv[]) {
   // This list should replicate the addHandler calls in TFileAdaptor
-  std::array<char const*, 14> const protocols = {{"^file:",
-                                                  "^http:",
-                                                  "^http[s]?:",
-                                                  "^ftp:",
-                                                  "^web:",
-                                                  "^gsiftp:",
-                                                  "^sfn:",
-                                                  "^dcache:",
-                                                  "^dcap:",
-                                                  "^gsidcap:",
-                                                  "^storm:",
-                                                  "^storm-lcg:",
-                                                  "^root:",
-                                                  "^[x]?root:"}};
-  std::array<char const*, 14> const uris{{"file:foo",
+  std::array<char const*, 10> const protocols = {
+      {"^file:", "^http:", "^http[s]?:", "^ftp:", "^web:", "^dcache:", "^dcap:", "^gsidcap:", "^root:", "^[x]?root:"}};
+  std::array<char const*, 10> const uris{{"file:foo",
                                           "http://foo",
                                           "https://foo",
                                           "ftp://foo",
                                           "web://foo",
-                                          "gsiftp://foo",
-                                          "sfn://foo",
                                           "dcache://foo",
                                           "dcap://foo",
                                           "gsidcap://foo",
-                                          "storm://foo",
-                                          "storm-lcg://foo",
                                           "root://foo",
                                           "xroot://foo"}};