From 98fb1ea21f43630f837bafeb46829bf61fe54669 Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:29:48 +0200 Subject: [PATCH 1/9] [net] Restore TGrid* classes They are critical for the ALICE experiment so they cannot be removed at this time. --- net/net/CMakeLists.txt | 13 ++ net/net/inc/LinkDef.h | 17 ++ net/net/inc/TGrid.h | 136 ++++++++++++++++ net/net/inc/TGridCollection.h | 125 +++++++++++++++ net/net/inc/TGridJDL.h | 84 ++++++++++ net/net/inc/TGridJob.h | 56 +++++++ net/net/inc/TGridJobStatus.h | 59 +++++++ net/net/inc/TGridJobStatusList.h | 48 ++++++ net/net/inc/TGridResult.h | 61 +++++++ net/net/src/TGrid.cxx | 77 +++++++++ net/net/src/TGridJDL.cxx | 245 +++++++++++++++++++++++++++++ net/net/src/TGridJob.cxx | 34 ++++ net/net/src/TGridJobStatus.cxx | 22 +++ net/net/src/TGridJobStatusList.cxx | 23 +++ net/net/src/TGridResult.cxx | 24 +++ 15 files changed, 1024 insertions(+) create mode 100644 net/net/inc/TGrid.h create mode 100644 net/net/inc/TGridCollection.h create mode 100644 net/net/inc/TGridJDL.h create mode 100644 net/net/inc/TGridJob.h create mode 100644 net/net/inc/TGridJobStatus.h create mode 100644 net/net/inc/TGridJobStatusList.h create mode 100644 net/net/inc/TGridResult.h create mode 100644 net/net/src/TGrid.cxx create mode 100644 net/net/src/TGridJDL.cxx create mode 100644 net/net/src/TGridJob.cxx create mode 100644 net/net/src/TGridJobStatus.cxx create mode 100644 net/net/src/TGridJobStatusList.cxx create mode 100644 net/net/src/TGridResult.cxx diff --git a/net/net/CMakeLists.txt b/net/net/CMakeLists.txt index de4009401b18a..697a18ce59686 100644 --- a/net/net/CMakeLists.txt +++ b/net/net/CMakeLists.txt @@ -15,6 +15,13 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net TApplicationRemote.h TApplicationServer.h TFileStager.h + TGrid.h + TGridCollection.h + TGridJDL.h + TGridJob.h + TGridJobStatus.h + TGridJobStatusList.h + TGridResult.h TMessage.h TMonitor.h TParallelMergingFile.h @@ -34,6 +41,12 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net src/NetErrors.cxx src/TApplicationRemote.cxx src/TApplicationServer.cxx + src/TGrid.cxx + src/TGridJDL.cxx + src/TGridJob.cxx + src/TGridJobStatus.cxx + src/TGridJobStatusList.cxx + src/TGridResult.cxx src/TFileStager.cxx src/TMessage.cxx src/TMonitor.cxx diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index 1760c4b430cb5..15f0f182210ca 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -14,6 +14,9 @@ #pragma link C++ enum ESockOptions; #pragma link C++ enum ESendRecvOptions; +#pragma link C++ global ROOT::Deprecated::gGrid; +#pragma link C++ global gGridJobStatusList; + #pragma link C++ class TServerSocket; #pragma link C++ class TSocket; #pragma link C++ class TPServerSocket; @@ -27,10 +30,24 @@ #pragma link C++ class TSQLTableInfo; #pragma link C++ class TSQLColumnInfo; #pragma link C++ class TSQLMonitoringWriter; +#pragma link C++ class ROOT::Deprecated::TGrid; +#pragma link C++ class ROOT::Deprecated::TGridResult+; +#pragma link C++ class ROOT::Deprecated::TGridJDL+; +#pragma link C++ class ROOT::Deprecated::TGridJob+; +#pragma link C++ class ROOT::Deprecated::TGridJobStatus+; +#pragma link C++ class ROOT::Deprecated::TGridJobStatusList+; +#pragma link C++ class ROOT::Deprecated::TGridCollection+; #pragma link C++ class TFileStager; #pragma link C++ class TApplicationRemote; #pragma link C++ class TApplicationServer; #pragma link C++ class TUDPSocket; #pragma link C++ class TParallelMergingFile+; +#pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection" +#pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL" +#pragma read sourceClass="TGridJob" version="[-1]" targetClass="ROOT::Deprecated::TGridJob" +#pragma read sourceClass="TGridJobStatus" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatus" +#pragma read sourceClass="TGridJobStatusList" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatusList" +#pragma read sourceClass="TGridResult" version="[-1]" targetClass="ROOT::Deprecated::TGridResult" + #endif diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h new file mode 100644 index 0000000000000..99cd3dbbd5e7b --- /dev/null +++ b/net/net/inc/TGrid.h @@ -0,0 +1,136 @@ +// @(#)root/net:$Id$ +// Author: Fons Rademakers 3/1/2002 + +/************************************************************************* + * Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +#ifndef ROOT_TGrid +#define ROOT_TGrid + +////////////////////////////////////////////////////////////////////////// +// // +// TGrid // +// // +// Abstract base class defining interface to common GRID services. // +// // +// To open a connection to a GRID use the static method Connect(). // +// The argument of Connect() is of the form: // +// ://[:], e.g. alien://alice.cern.ch // +// Depending on the specified an appropriate plugin library // +// will be loaded which will provide the real interface. // +// // +// Related classes are TGridResult. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TObject.h" + +#include "TString.h" + +#include "TGridJob.h" + +namespace ROOT::Deprecated { + +class TGridCollection; +class TGridJDL; +class TGridJob; +class TGridJobStatusList; +class TGridResult; + +class TGrid : public TObject { + +protected: + TString fGridUrl; // the GRID url used to create the grid connection + TString fGrid; // type of GRID (AliEn, ...) + TString fHost; // GRID portal to which we are connected + TString fUser; // user name + TString fPw; // user passwd + TString fOptions; // options specified + Int_t fPort; // port to which we are connected + +public: + TGrid() : fGridUrl(), fGrid(), fHost(), fUser(), fPw(), fOptions(), fPort(-1) {} + virtual ~TGrid() {} + + const char *GridUrl() const { return fGridUrl; } + const char *GetGrid() const { return fGrid; } + const char *GetHost() const { return fHost; } + const char *GetUser() const { return fUser; } + const char *GetPw() const { return fPw; } + const char *GetOptions() const { return fOptions; } + Int_t GetPort() const { return fPort; } + virtual Bool_t IsConnected() const { return fPort == -1 ? kFALSE : kTRUE; } + + virtual void Shell() { MayNotUse("Shell"); } + virtual void Stdout() { MayNotUse("Stdout"); } + virtual void Stderr() { MayNotUse("Stderr"); } + + virtual TGridResult *Command(const char * /*command*/, + Bool_t /*interactive*/ = kFALSE, + UInt_t /*stream*/ = 2) + { MayNotUse("Command"); return nullptr; } + + virtual TGridResult *Query(const char * /*path*/, const char * /*pattern*/, + const char * /*conditions*/ = "", const char * /*options*/ = "") + { MayNotUse("Query"); return nullptr; } + + virtual TGridResult *LocateSites() { MayNotUse("LocalSites"); return nullptr; } + + //--- Catalogue Interface + virtual TGridResult *Ls(const char* /*ldn*/ ="", Option_t* /*options*/ ="", Bool_t /*verbose*/ =kFALSE) + { MayNotUse("Ls"); return nullptr; } + virtual const char *Pwd(Bool_t /*verbose*/ =kFALSE) + { MayNotUse("Pwd"); return nullptr; } + virtual const char *GetHomeDirectory() + { MayNotUse("GetHomeDirectory"); return nullptr; } + virtual Bool_t Cd(const char* /*ldn*/ ="",Bool_t /*verbose*/ =kFALSE) + { MayNotUse("Cd"); return kFALSE; } + virtual Int_t Mkdir(const char* /*ldn*/ ="", Option_t* /*options*/ ="", Bool_t /*verbose*/ =kFALSE) + { MayNotUse("Mkdir"); return kFALSE; } + virtual Bool_t Rmdir(const char* /*ldn*/ ="", Option_t* /*options*/ ="", Bool_t /*verbose*/ =kFALSE) + { MayNotUse("Mkdir"); return kFALSE; } + virtual Bool_t Register(const char* /*lfn*/ , const char* /*turl*/ , Long_t /*size*/ =-1, const char* /*se*/ =nullptr, const char* /*guid*/ =nullptr, Bool_t /*verbose*/ =kFALSE) + { MayNotUse("Mkdir"); return kFALSE; } + virtual Bool_t Rm(const char* /*lfn*/ , Option_t* /*option*/ ="", Bool_t /*verbose*/ =kFALSE) + { MayNotUse("Mkdir"); return kFALSE; } + + //--- Job Submission Interface + virtual TGridJob *Submit(const char * /*jdl*/) + { MayNotUse("Submit"); return nullptr; } + virtual TGridJDL *GetJDLGenerator() + { MayNotUse("GetJDLGenerator"); return nullptr; } + virtual TGridCollection *OpenCollection(const char *, UInt_t /*maxentries*/ = 1000000) + { MayNotUse("OpenCollection"); return nullptr; } + virtual TGridCollection *OpenCollectionQuery(TGridResult * /*queryresult*/,Bool_t /*nogrouping*/ = kFALSE) + { MayNotUse("OpenCollection"); return nullptr; } + virtual TGridJobStatusList* Ps(const char* /*options*/, Bool_t /*verbose*/ = kTRUE) + { MayNotUse("Ps"); return nullptr; } + virtual Bool_t KillById(TString /*jobid*/) + { MayNotUse("KillById"); return kFALSE; } + virtual Bool_t ResubmitById(TString /*jobid*/) + { MayNotUse("ResubmitById"); return kFALSE; } + virtual Bool_t Kill(TGridJob *gridjob) + { return ((gridjob)?KillById(gridjob->GetJobID()):kFALSE); } + virtual Bool_t Resubmit(TGridJob* gridjob) + { return ((gridjob)?ResubmitById(gridjob->GetJobID()):kFALSE); } + + //--- Load desired plugin and setup conection to GRID + static TGrid *Connect(const char *grid, const char *uid = nullptr, + const char *pw = nullptr, const char *options = nullptr); + + ClassDefOverride(TGrid,0) // ABC defining interface to GRID services +}; + +R__EXTERN TGrid *gGrid; + +} // namespace ROOT::Deprecated + +using TGrid R__DEPRECATED(6, 42, "TGrid is expected to be unused and thus deprecated") = ROOT::Deprecated::TGrid; +R__EXTERN ROOT::Deprecated::TGrid *&gGrid R__DEPRECATED(6, 42, "gGrid is expected to be unused and thus deprecated"); + +#endif diff --git a/net/net/inc/TGridCollection.h b/net/net/inc/TGridCollection.h new file mode 100644 index 0000000000000..fd08c555e0c75 --- /dev/null +++ b/net/net/inc/TGridCollection.h @@ -0,0 +1,125 @@ +// @(#)root/net:$Id$ +// Author: Andreas-Joachim Peters 2005-05-09 + +/************************************************************************* + * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +#ifndef ROOT_TGridCollection +#define ROOT_TGridCollection + +////////////////////////////////////////////////////////////////////////// +// // +// TGridCollection // +// // +// Class which manages collection files on the Grid. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TObject.h" + +class TMap; +class TFile; +class TEntryList; +class TList; +class TDSet; +class TFileCollection; + +namespace ROOT::Deprecated { + +class TGridResult; + +class TGridCollection : public TObject { +public: + TGridCollection() { } + virtual ~TGridCollection() { } + + virtual void Reset() + { MayNotUse("Reset"); } + virtual TMap *Next() + { MayNotUse("Next"); return nullptr;} + virtual Bool_t Remove(TMap *) + { MayNotUse("Remove"); return 0;} + virtual const char *GetTURL(const char * /*name*/ = "") + { MayNotUse("GetTURL"); return nullptr;} + virtual const char *GetSURL(const char * /*name*/ = "") + { MayNotUse("GetSURL"); return nullptr;} + virtual const char *GetLFN(const char * /*name*/ = "") + { MayNotUse("GetLFN"); return nullptr;} + virtual Long64_t GetSize(const char * /*name*/ = "") + { MayNotUse("GetSize"); return -1;} + virtual Bool_t IsOnline(const char * /*name*/ = "") + { MayNotUse("IsOnline"); return 0;} + virtual Bool_t IsSelected(const char * /*name*/ = "") + { MayNotUse("IsSelected"); return 0;} + virtual void Status() + { MayNotUse("Status"); } + virtual void SetTag(const char * , const char * , TMap* ) + { MayNotUse("SetTag"); } + virtual Bool_t SelectFile(const char *, Int_t /*nstart*/ = -1 , Int_t /*nstop*/ = -1) + { MayNotUse("SelectFile"); return kFALSE;} + virtual Bool_t DeselectFile(const char *, Int_t /*nstart*/ = -1, Int_t /*nstop*/ = -1) + { MayNotUse("DeselectFile"); return kFALSE;} + virtual Bool_t InvertSelection() + { MayNotUse("InvertSelection"); return kFALSE;} + virtual Bool_t DownscaleSelection(UInt_t /* scaler */ = 2) + { MayNotUse("DownscaleSelection"); return kFALSE;} + virtual Bool_t ExportXML(const char *, Bool_t /*selected*/ = kTRUE, Bool_t /*online*/ = kTRUE, + const char * /*name*/ = "ROOT xml", const char * /*comment*/ = "Exported XML") + { MayNotUse("ExportXML"); return kFALSE;} + virtual const char* GetExportUrl() + { MayNotUse("GetExportUrl"); return nullptr;} + virtual Bool_t SetExportUrl(const char * /*exporturl*/ = nullptr) + { MayNotUse("SetExportUrl"); return kFALSE;} + virtual void Print(Option_t * = "") const override + { MayNotUse("Print"); } + virtual TFile *OpenFile(const char *) + { MayNotUse("OpenFile"); return nullptr;} + virtual TList *GetFileGroupList() const + { MayNotUse("GetFileGroupList"); return nullptr;} + virtual TEntryList *GetEntryList(const char *) + { MayNotUse("GetEntryList"); return nullptr;} + virtual UInt_t GetNofGroups() const + { MayNotUse("GetNofGroups"); return 0;} + virtual UInt_t GetNofGroupfiles() const + { MayNotUse("GetNofGroupfiles"); return 0;} + virtual Bool_t OverlapCollection(TGridCollection *) + { MayNotUse("OverlapCollection"); return 0;} + virtual void Add(TGridCollection *) + { MayNotUse("Add");} + virtual Bool_t Stage(Bool_t /*bulk*/ = kFALSE, Option_t * /*TFileStager option*/ = "") + { MayNotUse("Stage"); return kFALSE;} + virtual Bool_t Prepare(Bool_t /*bulk*/ = kFALSE) + { MayNotUse("Prepare"); return kFALSE;} + virtual Bool_t CheckIfOnline(Bool_t /*bulk*/ = kFALSE) + { MayNotUse("CheckIfOnline"); return kFALSE;} + virtual TDSet *GetDataset(const char *, const char * , const char *) + { MayNotUse("GetDataset"); return nullptr;} + virtual TGridResult *GetGridResult(const char * /*filename*/ = "", Bool_t /*onlyonline*/ = kTRUE , Bool_t /*publicaccess*/ = kFALSE ) + { MayNotUse("GetGridResult"); return nullptr;} + virtual Bool_t LookupSUrls(Bool_t /*verbose*/ = kTRUE) + { MayNotUse("LookupSUrls"); return kFALSE;} + virtual TList *GetTagFilterList() const + { MayNotUse("GetTagFilterList"); return nullptr;} + virtual void SetTagFilterList(TList *) + { MayNotUse("SetTagFilterList");} + virtual const char* GetCollectionName() const + { MayNotUse("GetCollectionName"); return nullptr;} + virtual const char* GetInfoComment() const + { MayNotUse("GetInfoComment"); return nullptr;} + virtual TFileCollection* GetFileCollection(const char* /*name*/ = "", const char* /*title*/ = "") const + { MayNotUse("GetFileCollection"); return nullptr;} + + ClassDefOverride(TGridCollection,1) // ABC managing collection of files on the Grid +}; + +} // namespace ROOT::Deprecated + +using TGridCollection R__DEPRECATED(6, 42, "TGridCollection is expected to be unused and thus deprecated") = + ROOT::Deprecated::TGridCollection; + +#endif diff --git a/net/net/inc/TGridJDL.h b/net/net/inc/TGridJDL.h new file mode 100644 index 0000000000000..6d36ddbb85fbb --- /dev/null +++ b/net/net/inc/TGridJDL.h @@ -0,0 +1,84 @@ +// @(#)root/net:$Id$ +// Author: Jan Fiete Grosse-Oetringhaus 28/9/2004 +// Jancurova.lucia@cern.ch Slovakia 29/9/2008 + +/************************************************************************* + * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +#ifndef ROOT_TGridJDL +#define ROOT_TGridJDL + +////////////////////////////////////////////////////////////////////////// +// // +// TGridJDL // +// // +// Abstract base class to generate JDL files for job submission to the // +// Grid. // +// // +// Related classes are TGLiteJDL // +// . // +////////////////////////////////////////////////////////////////////////// + +#include "TObject.h" +#include "TString.h" +#include "TMap.h" + +namespace ROOT::Deprecated { + +class TGridJDL : public TObject { +protected: + TMap fMap; // stores the key, value pairs of the JDL + TMap fDescriptionMap; // stores the key, value pairs of the JDL +public: + TGridJDL() : fMap(), fDescriptionMap() { } + virtual ~TGridJDL(); + + void SetValue(const char *key, const char *value); + const char *GetValue(const char *key); + void SetDescription(const char *key, const char *description); + const char *GetDescription(const char *key); + TString AddQuotes(const char *value); + void AddToSet(const char *key, const char *value); + void AddToSetDescription(const char *key, const char *description); + virtual TString Generate(); + void Clear(const Option_t* = "") override; + + virtual void SetExecutable(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void SetArguments(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void SetEMail(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void SetOutputDirectory(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void SetPrice(UInt_t price=1, const char *description=nullptr) = 0; + virtual void SetTTL(UInt_t ttl=72000, const char *description=nullptr) = 0; + virtual void SetJobTag(const char *jobtag=nullptr, const char *description=nullptr) = 0; + virtual void SetInputDataListFormat(const char *format="xml-single", const char *description=nullptr) = 0; + virtual void SetInputDataList(const char *list="collection.xml", const char *description=nullptr) = 0; + + virtual void SetSplitMode(const char *value, UInt_t maxnumberofinputfiles=0, + UInt_t maxinputfilesize=0, const char *d1=nullptr, + const char *d2=nullptr, const char *d3=nullptr) = 0; + virtual void SetSplitArguments(const char *splitarguments=nullptr, const char *description=nullptr) = 0; + virtual void SetValidationCommand(const char *value, const char *description=nullptr) = 0; + + virtual void AddToInputSandbox(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void AddToOutputSandbox(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void AddToInputData(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void AddToInputDataCollection(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void AddToRequirements(const char *value=nullptr, const char *description=nullptr) = 0; + virtual void AddToPackages(const char *name="AliRoot", const char *version="default", + const char *type="VO_ALICE", const char *description=nullptr) = 0; + virtual void AddToOutputArchive(const char *value=nullptr, const char *description=nullptr) = 0; + + ClassDefOverride(TGridJDL,1) // ABC defining interface JDL generator +}; + +} // namespace ROOT::Deprecated + +using TGridJDL R__DEPRECATED(6, 42, "TGridJDL is expected to be unused and thus deprecated") = + ROOT::Deprecated::TGridJDL; + +#endif diff --git a/net/net/inc/TGridJob.h b/net/net/inc/TGridJob.h new file mode 100644 index 0000000000000..9e5d7baea4b60 --- /dev/null +++ b/net/net/inc/TGridJob.h @@ -0,0 +1,56 @@ +// @(#)root/net:$Id$ +// Author: Jan Fiete Grosse-Oetringhaus 06/10/2004 + +/************************************************************************* + * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +#ifndef ROOT_TGridJob +#define ROOT_TGridJob + +////////////////////////////////////////////////////////////////////////// +// // +// TGridJob // +// // +// Abstract base class defining interface to a GRID job. // +// // +// Related classes are TGridJobStatus. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TObject.h" +#include "TString.h" + +namespace ROOT::Deprecated { + +class TGridJobStatus; + +class TGridJob : public TObject { + +protected: + TString fJobID; // the job's ID + +public: + TGridJob(TString jobID) : fJobID(jobID) { } + virtual ~TGridJob() { } + + virtual TString GetJobID() { return fJobID; } + + virtual TGridJobStatus *GetJobStatus() const = 0; + virtual Int_t GetOutputSandbox(const char *localpath, Option_t *opt = nullptr); + + virtual Bool_t Resubmit() = 0; + virtual Bool_t Cancel () = 0; + ClassDefOverride(TGridJob,1) // ABC defining interface to a GRID job +}; + +} // namespace ROOT::Deprecated + +using TGridJob R__DEPRECATED(6, 42, "TGridJob is expected to be unused and thus deprecated") = + ROOT::Deprecated::TGridJob; + +#endif diff --git a/net/net/inc/TGridJobStatus.h b/net/net/inc/TGridJobStatus.h new file mode 100644 index 0000000000000..bb6264ec038b2 --- /dev/null +++ b/net/net/inc/TGridJobStatus.h @@ -0,0 +1,59 @@ +// @(#)root/net:$Id$ +// Author: Jan Fiete Grosse-Oetringhaus 06/10/2004 + +/************************************************************************* + * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +#ifndef ROOT_TGridJobStatus +#define ROOT_TGridJobStatus + +////////////////////////////////////////////////////////////////////////// +// // +// TGridJobStatus // +// // +// Abstract base class containing the status of a Grid job. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TNamed.h" + +namespace ROOT::Deprecated { + +class TGridJobStatus : public TNamed { + +public: + // Subset of Grid job states for common GetStatus function + enum EGridJobStatus { +// clang++ [://][:], e.g. alien://alice.cern.ch // +// Depending on the specified an appropriate plugin library // +// will be loaded which will provide the real interface. // +// // +// Related classes are TGridResult. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TGrid.h" +#include "TROOT.h" +#include "TPluginManager.h" +#include "TError.h" + +ROOT::Deprecated::TGrid *ROOT::Deprecated::gGrid = 0; +ROOT::Deprecated::TGrid *&gGrid = ROOT::Deprecated::gGrid; + + + +//////////////////////////////////////////////////////////////////////////////// +/// The grid should be of the form: `://[:]`, +/// e.g.: alien://alice.cern.ch +/// The uid is the username and pw the password that should be used for +/// the connection. Depending on the `` the shared library (plugin) +/// for the selected system will be loaded. When the connection could not +/// be opened 0 is returned. For AliEn the supported options are: +/// -domain=`` +/// -debug=`` +/// Example: "-domain=cern.ch -debug=5" + +ROOT::Deprecated::TGrid * +ROOT::Deprecated::TGrid::Connect(const char *grid, const char *uid, const char *pw, const char *options) +{ + TPluginHandler *h; + TGrid *g = 0; + + if (!grid) { + ::Error("TGrid::Connect", "no grid specified"); + return 0; + } + if (!uid) + uid = ""; + if (!pw) + pw = ""; + if (!options) + options = ""; + + if ((h = gROOT->GetPluginManager()->FindHandler("TGrid", grid))) { + if (h->LoadPlugin() == -1) { + ::Error("TGrid::Connect", "Loading Plugin failed"); + return 0; + } + g = (TGrid *) h->ExecPlugin(4, grid, uid, pw, options); + } else { + ::Error("TGrid::Connect", "Could not find plugin to handle TGrid"); + } + + return g; +} diff --git a/net/net/src/TGridJDL.cxx b/net/net/src/TGridJDL.cxx new file mode 100644 index 0000000000000..c573221a0ecf2 --- /dev/null +++ b/net/net/src/TGridJDL.cxx @@ -0,0 +1,245 @@ +// @(#)root/net:$Id$ +// Author: Jan Fiete Grosse-Oetringhaus 28/9/2004 +// Jancurova.lucia@cern.ch Slovakia 29/9/2008 + +/************************************************************************* + * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +////////////////////////////////////////////////////////////////////////// +// // +// TGridJDL // +// // +// Abstract base class to generate JDL files for job submission to the // +// Grid. // +// // +// Related classes are TGLiteJDL. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TGridJDL.h" +#include "TObjString.h" +#include "Riostream.h" + + + +//////////////////////////////////////////////////////////////////////////////// +/// Cleanup. + +ROOT::Deprecated::TGridJDL::~TGridJDL() +{ + Clear(); +} + +//////////////////////////////////////////////////////////////////////////////// +/// Clears the JDL information. + +void ROOT::Deprecated::TGridJDL::Clear(const Option_t*) +{ + fMap.DeleteAll(); +} + +//////////////////////////////////////////////////////////////////////////////// +/// Sets a value. If the entry already exists the old one is replaced. + +void ROOT::Deprecated::TGridJDL::SetValue(const char *key, const char *value) +{ + TObject *object = fMap.FindObject(key); + TPair *pair = dynamic_cast(object); + if (pair) { + TObject *oldObject = pair->Key(); + if (oldObject) { + TObject *oldValue = pair->Value(); + + fMap.Remove(oldObject); + delete oldObject; + oldObject = 0; + + if (oldValue) { + delete oldValue; + oldValue = 0; + } + } + } + + fMap.Add(new TObjString(key), new TObjString(value)); +} + +//////////////////////////////////////////////////////////////////////////////// +/// Returns the value corresponding to the provided key. Return 0 in case +/// key is not found. + +const char *ROOT::Deprecated::TGridJDL::GetValue(const char *key) +{ + if (!key) + return 0; + + TObject *object = fMap.FindObject(key); + if (!object) + return 0; + + TPair *pair = dynamic_cast(object); + if (!pair) + return 0; + + TObject *value = pair->Value(); + if (!value) + return 0; + + TObjString *string = dynamic_cast(value); + if (!string) + return 0; + + return string->GetName(); +} + +//////////////////////////////////////////////////////////////////////////////// +/// Sets a value. If the entry already exists the old one is replaced. + +void ROOT::Deprecated::TGridJDL::SetDescription(const char *key, const char* description) +{ + TObject *object = fDescriptionMap.FindObject(key); + TPair *pair = dynamic_cast(object); + if (pair) { + TObject *oldObject = pair->Key(); + if (oldObject) { + TObject *oldValue = pair->Value(); + + fDescriptionMap.Remove(oldObject); + delete oldObject; + oldObject = 0; + + if (oldValue) { + delete oldValue; + oldValue = 0; + } + } + } + + fDescriptionMap.Add(new TObjString(key), new TObjString(description)); +} + +//////////////////////////////////////////////////////////////////////////////// +/// Returns the value corresponding to the provided key. Return 0 in case +/// key is not found. + +const char *ROOT::Deprecated::TGridJDL::GetDescription(const char *key) +{ + if (!key) + return 0; + + TObject *object = fDescriptionMap.FindObject(key); + if (!object) + return 0; + + TPair *pair = dynamic_cast(object); + if (!pair) + return 0; + + TObject *value = pair->Value(); + if (!value) + return 0; + + TObjString *string = dynamic_cast(value); + if (!string) + return 0; + + return string->GetName(); +} + +//////////////////////////////////////////////////////////////////////////////// +/// Adds quotes to the provided string. +/// E.g. Value --> "Value" + +TString ROOT::Deprecated::TGridJDL::AddQuotes(const char *value) +{ + TString temp = TString("\""); + temp += value; + temp += "\""; + + return temp; +} + +//////////////////////////////////////////////////////////////////////////////// +/// Adds a value to a key value which hosts a set of values. +/// E.g. InputSandbox: {"file1","file2"} + +void ROOT::Deprecated::TGridJDL::AddToSet(const char *key, const char *value) +{ + const char *oldValue = GetValue(key); + TString newString; + if (oldValue) + newString = oldValue; + if (newString.IsNull()) { + newString = "{"; + } else { + newString.Remove(newString.Length()-1); + newString += ","; + } + + newString += AddQuotes(value); + newString += "}"; + + SetValue(key, newString); +} + +//////////////////////////////////////////////////////////////////////////////// +/// Adds a value to a key value which hosts a set of values. +/// E.g. InputSandbox: {"file1","file2"} + +void ROOT::Deprecated::TGridJDL::AddToSetDescription(const char *key, const char *description) +{ + const char *oldValue = GetDescription(key); + TString newString; + if (oldValue) + newString = oldValue; + newString += description; + + SetDescription(key, newString); +} +//////////////////////////////////////////////////////////////////////////////// +/// Generates the JDL snippet. + +TString ROOT::Deprecated::TGridJDL::Generate() +{ + TString output(""); + + TIter next(&fMap); + TIter nextDescription(&fDescriptionMap); + TObject *object = 0; + TObject *objectD = 0; + while ((object = next())) { + TObjString *key = dynamic_cast(object); + if (key) { + TObject *value = fMap.GetValue(object); + TObjString *valueobj = dynamic_cast(value); + + if (valueobj) { + nextDescription.Reset(); + while ((objectD = nextDescription())) { + TObjString *keyD = dynamic_cast(objectD); + if (keyD) { + TObject *valueD = fDescriptionMap.GetValue(objectD); + TObjString *valueobjD = dynamic_cast(valueD); + if (valueobjD && !strcmp(key->GetName(), keyD->GetName())){ + //Info("",Form("%s %s",key->GetString().Data(),keyD->GetString().Data())); + output += "# "; + output += valueobjD->GetName(); + output += "\n"; + } + } + } + output += key->GetName(); + output += " = "; + output += valueobj->GetName(); + output += ";\n\n"; + } + } + } + + return output; +} diff --git a/net/net/src/TGridJob.cxx b/net/net/src/TGridJob.cxx new file mode 100644 index 0000000000000..714bc442db0d5 --- /dev/null +++ b/net/net/src/TGridJob.cxx @@ -0,0 +1,34 @@ +// @(#)root/net:$Id$ +// Author: Jan Fiete Grosse-Oetringhaus 06/10/2004 + +/************************************************************************* + * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +////////////////////////////////////////////////////////////////////////// +// // +// TGridJob // +// // +// Abstract base class defining interface to a GRID job. // +// // +// Related classes are TGridJobStatus. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TGridJob.h" + + + +//////////////////////////////////////////////////////////////////////////////// +/// Must be implemented by actual GRID job implementation. Returns -1 in +/// case of error, 0 otherwise. + +Int_t ROOT::Deprecated::TGridJob::GetOutputSandbox(const char *, Option_t *) +{ + MayNotUse("GetOutputSandbox"); + return -1; +} diff --git a/net/net/src/TGridJobStatus.cxx b/net/net/src/TGridJobStatus.cxx new file mode 100644 index 0000000000000..c7a3aa7483541 --- /dev/null +++ b/net/net/src/TGridJobStatus.cxx @@ -0,0 +1,22 @@ +// @(#)root/net:$Id$ +// Author: Jan Fiete Grosse-Oetringhaus 06/10/2004 + +/************************************************************************* + * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +////////////////////////////////////////////////////////////////////////// +// // +// TGridJobStatus // +// // +// Abstract base class containing the status of a Grid job. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TGridJobStatus.h" + + diff --git a/net/net/src/TGridJobStatusList.cxx b/net/net/src/TGridJobStatusList.cxx new file mode 100644 index 0000000000000..d7e2d30d33d1d --- /dev/null +++ b/net/net/src/TGridJobStatusList.cxx @@ -0,0 +1,23 @@ +// @(#)root/net:$Id$ +// Author: Andreas-Joachim Peters 10/12/2006 + +/************************************************************************* + * Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +////////////////////////////////////////////////////////////////////////// +// // +// TGridJobStatusList // +// // +// Abstract base class defining a list of GRID job status // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TGridJobStatusList.h" + +ROOT::Deprecated::TGridJobStatusList *ROOT::Deprecated::gGridJobStatusList = 0; +ROOT::Deprecated::TGridJobStatusList *&gGridJobStatusList = ROOT::Deprecated::gGridJobStatusList; diff --git a/net/net/src/TGridResult.cxx b/net/net/src/TGridResult.cxx new file mode 100644 index 0000000000000..6a39822002938 --- /dev/null +++ b/net/net/src/TGridResult.cxx @@ -0,0 +1,24 @@ +// @(#)root/net:$Id$ +// Author: Fons Rademakers 23/5/2002 + +/************************************************************************* + * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * + * All rights reserved. * + * * + * For the licensing terms see $ROOTSYS/LICENSE. * + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + +////////////////////////////////////////////////////////////////////////// +// // +// TGridResult // +// // +// Abstract base class defining interface to a GRID result. // +// Objects of this class are created by TGrid methods. // +// // +// Related classes are TGrid. // +// // +////////////////////////////////////////////////////////////////////////// + +#include "TGridResult.h" + From 3378752009bfeb920fe08f1f2fa185d78bdcb81d Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:32:26 +0200 Subject: [PATCH 2/9] Revert "[net] deprecate TGridResult" This reverts commit 2b49802165eb80d9a43e6d345e9c00c6e99e917f. --- net/net/inc/LinkDef.h | 3 +-- net/net/inc/TGrid.h | 3 ++- net/net/inc/TGridCollection.h | 3 +-- net/net/inc/TGridResult.h | 6 ------ 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index 15f0f182210ca..d9f0135e82683 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -31,7 +31,7 @@ #pragma link C++ class TSQLColumnInfo; #pragma link C++ class TSQLMonitoringWriter; #pragma link C++ class ROOT::Deprecated::TGrid; -#pragma link C++ class ROOT::Deprecated::TGridResult+; +#pragma link C++ class TGridResult+; #pragma link C++ class ROOT::Deprecated::TGridJDL+; #pragma link C++ class ROOT::Deprecated::TGridJob+; #pragma link C++ class ROOT::Deprecated::TGridJobStatus+; @@ -48,6 +48,5 @@ #pragma read sourceClass="TGridJob" version="[-1]" targetClass="ROOT::Deprecated::TGridJob" #pragma read sourceClass="TGridJobStatus" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatus" #pragma read sourceClass="TGridJobStatusList" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatusList" -#pragma read sourceClass="TGridResult" version="[-1]" targetClass="ROOT::Deprecated::TGridResult" #endif diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h index 99cd3dbbd5e7b..bf2c852bcf41e 100644 --- a/net/net/inc/TGrid.h +++ b/net/net/inc/TGrid.h @@ -34,13 +34,14 @@ #include "TGridJob.h" +class TGridResult; + namespace ROOT::Deprecated { class TGridCollection; class TGridJDL; class TGridJob; class TGridJobStatusList; -class TGridResult; class TGrid : public TObject { diff --git a/net/net/inc/TGridCollection.h b/net/net/inc/TGridCollection.h index fd08c555e0c75..e2ff96516fcf3 100644 --- a/net/net/inc/TGridCollection.h +++ b/net/net/inc/TGridCollection.h @@ -27,12 +27,11 @@ class TFile; class TEntryList; class TList; class TDSet; +class TGridResult; class TFileCollection; namespace ROOT::Deprecated { -class TGridResult; - class TGridCollection : public TObject { public: TGridCollection() { } diff --git a/net/net/inc/TGridResult.h b/net/net/inc/TGridResult.h index 943ece3d5c7f9..e076efebb282e 100644 --- a/net/net/inc/TGridResult.h +++ b/net/net/inc/TGridResult.h @@ -27,7 +27,6 @@ class TEntryList; -namespace ROOT::Deprecated { class TGridResult : public TList { @@ -53,9 +52,4 @@ class TGridResult : public TList { ClassDefOverride(TGridResult,1) // ABC defining interface to GRID result set }; -} // namespace ROOT::Deprecated - -using TGridResult R__DEPRECATED(6, 42, "TGridResult is expected to be unused and thus deprecated") = - ROOT::Deprecated::TGridResult; - #endif From 35f610c6c393ba6c57916b29f7af6e5417338aec Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:32:30 +0200 Subject: [PATCH 3/9] Revert "[net] deprecate TGridJobStatusList" This reverts commit 2c4b6329ac94e959b9f33947efc2996c458f49d2. --- net/net/inc/LinkDef.h | 3 +-- net/net/inc/TGrid.h | 2 +- net/net/inc/TGridJobStatusList.h | 9 --------- net/net/src/TGridJobStatusList.cxx | 5 +++-- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index d9f0135e82683..f0a7ed14fc5b3 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -35,7 +35,7 @@ #pragma link C++ class ROOT::Deprecated::TGridJDL+; #pragma link C++ class ROOT::Deprecated::TGridJob+; #pragma link C++ class ROOT::Deprecated::TGridJobStatus+; -#pragma link C++ class ROOT::Deprecated::TGridJobStatusList+; +#pragma link C++ class TGridJobStatusList+; #pragma link C++ class ROOT::Deprecated::TGridCollection+; #pragma link C++ class TFileStager; #pragma link C++ class TApplicationRemote; @@ -47,6 +47,5 @@ #pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL" #pragma read sourceClass="TGridJob" version="[-1]" targetClass="ROOT::Deprecated::TGridJob" #pragma read sourceClass="TGridJobStatus" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatus" -#pragma read sourceClass="TGridJobStatusList" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatusList" #endif diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h index bf2c852bcf41e..35125532632c0 100644 --- a/net/net/inc/TGrid.h +++ b/net/net/inc/TGrid.h @@ -35,13 +35,13 @@ #include "TGridJob.h" class TGridResult; +class TGridJobStatusList; namespace ROOT::Deprecated { class TGridCollection; class TGridJDL; class TGridJob; -class TGridJobStatusList; class TGrid : public TObject { diff --git a/net/net/inc/TGridJobStatusList.h b/net/net/inc/TGridJobStatusList.h index a8b427b0de49a..13e00dea29d50 100644 --- a/net/net/inc/TGridJobStatusList.h +++ b/net/net/inc/TGridJobStatusList.h @@ -22,8 +22,6 @@ #include "TList.h" -namespace ROOT::Deprecated { - class TGridJobStatusList : public TList { protected: @@ -38,11 +36,4 @@ class TGridJobStatusList : public TList { R__EXTERN TGridJobStatusList *gGridJobStatusList; -} // namespace ROOT::Deprecated - -using TGridJobStatusList R__DEPRECATED(6, 42, "TGridJobStatusList is expected to be unused and thus deprecated") = - ROOT::Deprecated::TGridJobStatusList; -R__EXTERN ROOT::Deprecated::TGridJobStatusList *&gGridJobStatusList - R__DEPRECATED(6, 42, "gGridJobStatusList is expected to be unused and thus deprecated"); - #endif diff --git a/net/net/src/TGridJobStatusList.cxx b/net/net/src/TGridJobStatusList.cxx index d7e2d30d33d1d..1430134955dfd 100644 --- a/net/net/src/TGridJobStatusList.cxx +++ b/net/net/src/TGridJobStatusList.cxx @@ -19,5 +19,6 @@ #include "TGridJobStatusList.h" -ROOT::Deprecated::TGridJobStatusList *ROOT::Deprecated::gGridJobStatusList = 0; -ROOT::Deprecated::TGridJobStatusList *&gGridJobStatusList = ROOT::Deprecated::gGridJobStatusList; +TGridJobStatusList *gGridJobStatusList = 0; + + From cd4e8494bfd9746fba066345764a46c13de4e5a7 Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:32:35 +0200 Subject: [PATCH 4/9] Revert "[net] deprecate TGridJobStatus" This reverts commit d2616babb72834dca05b41fb51a3acb7dc7a9636. --- net/net/inc/LinkDef.h | 3 +-- net/net/inc/TGridJob.h | 3 ++- net/net/inc/TGridJobStatus.h | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index f0a7ed14fc5b3..7aa365fe99c2a 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -34,7 +34,7 @@ #pragma link C++ class TGridResult+; #pragma link C++ class ROOT::Deprecated::TGridJDL+; #pragma link C++ class ROOT::Deprecated::TGridJob+; -#pragma link C++ class ROOT::Deprecated::TGridJobStatus+; +#pragma link C++ class TGridJobStatus+; #pragma link C++ class TGridJobStatusList+; #pragma link C++ class ROOT::Deprecated::TGridCollection+; #pragma link C++ class TFileStager; @@ -46,6 +46,5 @@ #pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection" #pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL" #pragma read sourceClass="TGridJob" version="[-1]" targetClass="ROOT::Deprecated::TGridJob" -#pragma read sourceClass="TGridJobStatus" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatus" #endif diff --git a/net/net/inc/TGridJob.h b/net/net/inc/TGridJob.h index 9e5d7baea4b60..1555cea03fcf7 100644 --- a/net/net/inc/TGridJob.h +++ b/net/net/inc/TGridJob.h @@ -25,10 +25,11 @@ #include "TObject.h" #include "TString.h" -namespace ROOT::Deprecated { class TGridJobStatus; +namespace ROOT::Deprecated { + class TGridJob : public TObject { protected: diff --git a/net/net/inc/TGridJobStatus.h b/net/net/inc/TGridJobStatus.h index bb6264ec038b2..f918c69dbc555 100644 --- a/net/net/inc/TGridJobStatus.h +++ b/net/net/inc/TGridJobStatus.h @@ -22,7 +22,6 @@ #include "TNamed.h" -namespace ROOT::Deprecated { class TGridJobStatus : public TNamed { @@ -51,9 +50,4 @@ class TGridJobStatus : public TNamed { ClassDefOverride(TGridJobStatus,1) // ABC defining status of a Grid job }; -} // namespace ROOT::Deprecated - -using TGridJobStatus R__DEPRECATED(6, 42, "TGridJobStatus is expected to be unused and thus deprecated") = - ROOT::Deprecated::TGridJobStatus; - #endif From 92d091ccf0f4b8379c2efa9ed92f506e997644c6 Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:32:39 +0200 Subject: [PATCH 5/9] Revert "[net] deprecate TGridJob" This reverts commit 12fec18980a4d0ce98197b9ca47c7e79f819e278. --- net/net/inc/LinkDef.h | 3 +-- net/net/inc/TGrid.h | 2 +- net/net/inc/TGridJob.h | 7 ------- net/net/inc/TGridJobStatusList.h | 5 +++++ net/net/src/TGridJob.cxx | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index 7aa365fe99c2a..5da236c1aed59 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -33,7 +33,7 @@ #pragma link C++ class ROOT::Deprecated::TGrid; #pragma link C++ class TGridResult+; #pragma link C++ class ROOT::Deprecated::TGridJDL+; -#pragma link C++ class ROOT::Deprecated::TGridJob+; +#pragma link C++ class TGridJob+; #pragma link C++ class TGridJobStatus+; #pragma link C++ class TGridJobStatusList+; #pragma link C++ class ROOT::Deprecated::TGridCollection+; @@ -45,6 +45,5 @@ #pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection" #pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL" -#pragma read sourceClass="TGridJob" version="[-1]" targetClass="ROOT::Deprecated::TGridJob" #endif diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h index 35125532632c0..dbb2e52376b07 100644 --- a/net/net/inc/TGrid.h +++ b/net/net/inc/TGrid.h @@ -35,13 +35,13 @@ #include "TGridJob.h" class TGridResult; +class TGridJob; class TGridJobStatusList; namespace ROOT::Deprecated { class TGridCollection; class TGridJDL; -class TGridJob; class TGrid : public TObject { diff --git a/net/net/inc/TGridJob.h b/net/net/inc/TGridJob.h index 1555cea03fcf7..a91e8a9b17f6e 100644 --- a/net/net/inc/TGridJob.h +++ b/net/net/inc/TGridJob.h @@ -28,8 +28,6 @@ class TGridJobStatus; -namespace ROOT::Deprecated { - class TGridJob : public TObject { protected: @@ -49,9 +47,4 @@ class TGridJob : public TObject { ClassDefOverride(TGridJob,1) // ABC defining interface to a GRID job }; -} // namespace ROOT::Deprecated - -using TGridJob R__DEPRECATED(6, 42, "TGridJob is expected to be unused and thus deprecated") = - ROOT::Deprecated::TGridJob; - #endif diff --git a/net/net/inc/TGridJobStatusList.h b/net/net/inc/TGridJobStatusList.h index 13e00dea29d50..74e81d325e135 100644 --- a/net/net/inc/TGridJobStatusList.h +++ b/net/net/inc/TGridJobStatusList.h @@ -22,6 +22,11 @@ #include "TList.h" +#include "TGridJob.h" + + +class TGridJob; + class TGridJobStatusList : public TList { protected: diff --git a/net/net/src/TGridJob.cxx b/net/net/src/TGridJob.cxx index 714bc442db0d5..70ec54afacb31 100644 --- a/net/net/src/TGridJob.cxx +++ b/net/net/src/TGridJob.cxx @@ -27,7 +27,7 @@ /// Must be implemented by actual GRID job implementation. Returns -1 in /// case of error, 0 otherwise. -Int_t ROOT::Deprecated::TGridJob::GetOutputSandbox(const char *, Option_t *) +Int_t TGridJob::GetOutputSandbox(const char *, Option_t *) { MayNotUse("GetOutputSandbox"); return -1; From f406c7798d88936ba22e802fd44d3dd7a0e31155 Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:32:44 +0200 Subject: [PATCH 6/9] Revert "[net] deprecate TGridJDL" This reverts commit b928abe0831c8f8aead1d8d970b01cf6ec8270b6. --- net/net/inc/LinkDef.h | 3 +-- net/net/inc/TGrid.h | 2 +- net/net/inc/TGridJDL.h | 6 ------ net/net/src/TGridJDL.cxx | 20 ++++++++++---------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index 5da236c1aed59..96d269e27a450 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -32,7 +32,7 @@ #pragma link C++ class TSQLMonitoringWriter; #pragma link C++ class ROOT::Deprecated::TGrid; #pragma link C++ class TGridResult+; -#pragma link C++ class ROOT::Deprecated::TGridJDL+; +#pragma link C++ class TGridJDL+; #pragma link C++ class TGridJob+; #pragma link C++ class TGridJobStatus+; #pragma link C++ class TGridJobStatusList+; @@ -44,6 +44,5 @@ #pragma link C++ class TParallelMergingFile+; #pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection" -#pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL" #endif diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h index dbb2e52376b07..306c178216c1e 100644 --- a/net/net/inc/TGrid.h +++ b/net/net/inc/TGrid.h @@ -35,13 +35,13 @@ #include "TGridJob.h" class TGridResult; +class TGridJDL; class TGridJob; class TGridJobStatusList; namespace ROOT::Deprecated { class TGridCollection; -class TGridJDL; class TGrid : public TObject { diff --git a/net/net/inc/TGridJDL.h b/net/net/inc/TGridJDL.h index 6d36ddbb85fbb..f3f2b5c8b96b1 100644 --- a/net/net/inc/TGridJDL.h +++ b/net/net/inc/TGridJDL.h @@ -28,7 +28,6 @@ #include "TString.h" #include "TMap.h" -namespace ROOT::Deprecated { class TGridJDL : public TObject { protected: @@ -76,9 +75,4 @@ class TGridJDL : public TObject { ClassDefOverride(TGridJDL,1) // ABC defining interface JDL generator }; -} // namespace ROOT::Deprecated - -using TGridJDL R__DEPRECATED(6, 42, "TGridJDL is expected to be unused and thus deprecated") = - ROOT::Deprecated::TGridJDL; - #endif diff --git a/net/net/src/TGridJDL.cxx b/net/net/src/TGridJDL.cxx index c573221a0ecf2..d58b419100b0e 100644 --- a/net/net/src/TGridJDL.cxx +++ b/net/net/src/TGridJDL.cxx @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// /// Cleanup. -ROOT::Deprecated::TGridJDL::~TGridJDL() +TGridJDL::~TGridJDL() { Clear(); } @@ -38,7 +38,7 @@ ROOT::Deprecated::TGridJDL::~TGridJDL() //////////////////////////////////////////////////////////////////////////////// /// Clears the JDL information. -void ROOT::Deprecated::TGridJDL::Clear(const Option_t*) +void TGridJDL::Clear(const Option_t*) { fMap.DeleteAll(); } @@ -46,7 +46,7 @@ void ROOT::Deprecated::TGridJDL::Clear(const Option_t*) //////////////////////////////////////////////////////////////////////////////// /// Sets a value. If the entry already exists the old one is replaced. -void ROOT::Deprecated::TGridJDL::SetValue(const char *key, const char *value) +void TGridJDL::SetValue(const char *key, const char *value) { TObject *object = fMap.FindObject(key); TPair *pair = dynamic_cast(object); @@ -73,7 +73,7 @@ void ROOT::Deprecated::TGridJDL::SetValue(const char *key, const char *value) /// Returns the value corresponding to the provided key. Return 0 in case /// key is not found. -const char *ROOT::Deprecated::TGridJDL::GetValue(const char *key) +const char *TGridJDL::GetValue(const char *key) { if (!key) return 0; @@ -100,7 +100,7 @@ const char *ROOT::Deprecated::TGridJDL::GetValue(const char *key) //////////////////////////////////////////////////////////////////////////////// /// Sets a value. If the entry already exists the old one is replaced. -void ROOT::Deprecated::TGridJDL::SetDescription(const char *key, const char* description) +void TGridJDL::SetDescription(const char *key, const char* description) { TObject *object = fDescriptionMap.FindObject(key); TPair *pair = dynamic_cast(object); @@ -127,7 +127,7 @@ void ROOT::Deprecated::TGridJDL::SetDescription(const char *key, const char* des /// Returns the value corresponding to the provided key. Return 0 in case /// key is not found. -const char *ROOT::Deprecated::TGridJDL::GetDescription(const char *key) +const char *TGridJDL::GetDescription(const char *key) { if (!key) return 0; @@ -155,7 +155,7 @@ const char *ROOT::Deprecated::TGridJDL::GetDescription(const char *key) /// Adds quotes to the provided string. /// E.g. Value --> "Value" -TString ROOT::Deprecated::TGridJDL::AddQuotes(const char *value) +TString TGridJDL::AddQuotes(const char *value) { TString temp = TString("\""); temp += value; @@ -168,7 +168,7 @@ TString ROOT::Deprecated::TGridJDL::AddQuotes(const char *value) /// Adds a value to a key value which hosts a set of values. /// E.g. InputSandbox: {"file1","file2"} -void ROOT::Deprecated::TGridJDL::AddToSet(const char *key, const char *value) +void TGridJDL::AddToSet(const char *key, const char *value) { const char *oldValue = GetValue(key); TString newString; @@ -191,7 +191,7 @@ void ROOT::Deprecated::TGridJDL::AddToSet(const char *key, const char *value) /// Adds a value to a key value which hosts a set of values. /// E.g. InputSandbox: {"file1","file2"} -void ROOT::Deprecated::TGridJDL::AddToSetDescription(const char *key, const char *description) +void TGridJDL::AddToSetDescription(const char *key, const char *description) { const char *oldValue = GetDescription(key); TString newString; @@ -204,7 +204,7 @@ void ROOT::Deprecated::TGridJDL::AddToSetDescription(const char *key, const char //////////////////////////////////////////////////////////////////////////////// /// Generates the JDL snippet. -TString ROOT::Deprecated::TGridJDL::Generate() +TString TGridJDL::Generate() { TString output(""); From 3992859c88b5bc7762c0b4cb0d0d8c6703e3eb5a Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:33:43 +0200 Subject: [PATCH 7/9] Revert "[net] deprecate TGridCollection" This reverts commit 18c9e6e9e094e4f48a103e0fb8f2bea45f9e0f9b. --- net/net/inc/LinkDef.h | 4 +--- net/net/inc/TGrid.h | 3 +-- net/net/inc/TGridCollection.h | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index 96d269e27a450..5b64fef0c462d 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -36,13 +36,11 @@ #pragma link C++ class TGridJob+; #pragma link C++ class TGridJobStatus+; #pragma link C++ class TGridJobStatusList+; -#pragma link C++ class ROOT::Deprecated::TGridCollection+; +#pragma link C++ class TGridCollection+; #pragma link C++ class TFileStager; #pragma link C++ class TApplicationRemote; #pragma link C++ class TApplicationServer; #pragma link C++ class TUDPSocket; #pragma link C++ class TParallelMergingFile+; -#pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection" - #endif diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h index 306c178216c1e..d63a46416007d 100644 --- a/net/net/inc/TGrid.h +++ b/net/net/inc/TGrid.h @@ -37,12 +37,11 @@ class TGridResult; class TGridJDL; class TGridJob; +class TGridCollection; class TGridJobStatusList; namespace ROOT::Deprecated { -class TGridCollection; - class TGrid : public TObject { protected: diff --git a/net/net/inc/TGridCollection.h b/net/net/inc/TGridCollection.h index e2ff96516fcf3..0a2fe54293cbb 100644 --- a/net/net/inc/TGridCollection.h +++ b/net/net/inc/TGridCollection.h @@ -30,7 +30,6 @@ class TDSet; class TGridResult; class TFileCollection; -namespace ROOT::Deprecated { class TGridCollection : public TObject { public: @@ -116,9 +115,4 @@ class TGridCollection : public TObject { ClassDefOverride(TGridCollection,1) // ABC managing collection of files on the Grid }; -} // namespace ROOT::Deprecated - -using TGridCollection R__DEPRECATED(6, 42, "TGridCollection is expected to be unused and thus deprecated") = - ROOT::Deprecated::TGridCollection; - #endif From 064728299ca08795fd815bacd4b141dce090ff50 Mon Sep 17 00:00:00 2001 From: silverweed Date: Tue, 21 Jul 2026 17:33:48 +0200 Subject: [PATCH 8/9] Revert "[net] deprecate TGrid, gGrid" This reverts commit af16dd63882794cc4eb7054f8a798da365d2cb3b. --- net/net/inc/LinkDef.h | 4 ++-- net/net/inc/TGrid.h | 6 ------ net/net/src/TGrid.cxx | 7 +++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index 5b64fef0c462d..436ada902af09 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -14,7 +14,7 @@ #pragma link C++ enum ESockOptions; #pragma link C++ enum ESendRecvOptions; -#pragma link C++ global ROOT::Deprecated::gGrid; +#pragma link C++ global gGrid; #pragma link C++ global gGridJobStatusList; #pragma link C++ class TServerSocket; @@ -30,7 +30,7 @@ #pragma link C++ class TSQLTableInfo; #pragma link C++ class TSQLColumnInfo; #pragma link C++ class TSQLMonitoringWriter; -#pragma link C++ class ROOT::Deprecated::TGrid; +#pragma link C++ class TGrid; #pragma link C++ class TGridResult+; #pragma link C++ class TGridJDL+; #pragma link C++ class TGridJob+; diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h index d63a46416007d..91a5da4eede9b 100644 --- a/net/net/inc/TGrid.h +++ b/net/net/inc/TGrid.h @@ -40,7 +40,6 @@ class TGridJob; class TGridCollection; class TGridJobStatusList; -namespace ROOT::Deprecated { class TGrid : public TObject { @@ -128,9 +127,4 @@ class TGrid : public TObject { R__EXTERN TGrid *gGrid; -} // namespace ROOT::Deprecated - -using TGrid R__DEPRECATED(6, 42, "TGrid is expected to be unused and thus deprecated") = ROOT::Deprecated::TGrid; -R__EXTERN ROOT::Deprecated::TGrid *&gGrid R__DEPRECATED(6, 42, "gGrid is expected to be unused and thus deprecated"); - #endif diff --git a/net/net/src/TGrid.cxx b/net/net/src/TGrid.cxx index a049bc53bc6c4..b9c7459fe5059 100644 --- a/net/net/src/TGrid.cxx +++ b/net/net/src/TGrid.cxx @@ -30,8 +30,7 @@ #include "TPluginManager.h" #include "TError.h" -ROOT::Deprecated::TGrid *ROOT::Deprecated::gGrid = 0; -ROOT::Deprecated::TGrid *&gGrid = ROOT::Deprecated::gGrid; +TGrid *gGrid = 0; @@ -46,8 +45,8 @@ ROOT::Deprecated::TGrid *&gGrid = ROOT::Deprecated::gGrid; /// -debug=`` /// Example: "-domain=cern.ch -debug=5" -ROOT::Deprecated::TGrid * -ROOT::Deprecated::TGrid::Connect(const char *grid, const char *uid, const char *pw, const char *options) +TGrid *TGrid::Connect(const char *grid, const char *uid, const char *pw, + const char *options) { TPluginHandler *h; TGrid *g = 0; From 2d47cab05c698c71f7c729c1747e34081aca43f6 Mon Sep 17 00:00:00 2001 From: silverweed Date: Fri, 24 Jul 2026 15:10:28 +0200 Subject: [PATCH 9/9] [NFC][skip-ci][net] add deprecation comment to TGrid* classes --- net/net/inc/TGrid.h | 34 ++++++++++++++++-------------- net/net/inc/TGridCollection.h | 16 +++++++------- net/net/inc/TGridJDL.h | 14 ++++++------ net/net/inc/TGridJob.h | 20 +++++++++--------- net/net/inc/TGridJobStatus.h | 16 +++++++------- net/net/inc/TGridJobStatusList.h | 16 +++++++------- net/net/inc/TGridResult.h | 22 +++++++++---------- net/net/src/TGrid.cxx | 16 -------------- net/net/src/TGridJDL.cxx | 11 ---------- net/net/src/TGridJob.cxx | 10 --------- net/net/src/TGridJobStatus.cxx | 8 ------- net/net/src/TGridJobStatusList.cxx | 8 ------- net/net/src/TGridResult.cxx | 11 ---------- 13 files changed, 69 insertions(+), 133 deletions(-) diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h index 91a5da4eede9b..dd26464393f6e 100644 --- a/net/net/inc/TGrid.h +++ b/net/net/inc/TGrid.h @@ -12,22 +12,6 @@ #ifndef ROOT_TGrid #define ROOT_TGrid -////////////////////////////////////////////////////////////////////////// -// // -// TGrid // -// // -// Abstract base class defining interface to common GRID services. // -// // -// To open a connection to a GRID use the static method Connect(). // -// The argument of Connect() is of the form: // -// ://[:], e.g. alien://alice.cern.ch // -// Depending on the specified an appropriate plugin library // -// will be loaded which will provide the real interface. // -// // -// Related classes are TGridResult. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TObject.h" #include "TString.h" @@ -41,6 +25,24 @@ class TGridCollection; class TGridJobStatusList; +/////////////////////////////////////////////////////////////////////////// +/// +/// Abstract base class defining interface to common GRID services. +/// +/// \note This class is deprecated. It is kept for backward compatibility +/// but it should not be used in new code. +/// +/// To open a connection to a GRID use the static method Connect(). +/// The argument of Connect() is of the form: +/// ~~~ +/// ://[:], e.g. alien://alice.cern.ch +/// ~~~ +/// Depending on the specified an appropriate plugin library +/// will be loaded which will provide the real interface. +/// +/// Related classes are TGridResult. +/// +/////////////////////////////////////////////////////////////////////////// class TGrid : public TObject { protected: diff --git a/net/net/inc/TGridCollection.h b/net/net/inc/TGridCollection.h index 0a2fe54293cbb..18f2ed4b14078 100644 --- a/net/net/inc/TGridCollection.h +++ b/net/net/inc/TGridCollection.h @@ -12,14 +12,6 @@ #ifndef ROOT_TGridCollection #define ROOT_TGridCollection -////////////////////////////////////////////////////////////////////////// -// // -// TGridCollection // -// // -// Class which manages collection files on the Grid. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TObject.h" class TMap; @@ -31,6 +23,14 @@ class TGridResult; class TFileCollection; +////////////////////////////////////////////////////////////////////////// +/// +/// \note This class is deprecated. It is kept for backward compatibility +/// but it should not be used in new code. +/// +/// Class which manages collection files on the Grid. +/// +////////////////////////////////////////////////////////////////////////// class TGridCollection : public TObject { public: TGridCollection() { } diff --git a/net/net/inc/TGridJDL.h b/net/net/inc/TGridJDL.h index f3f2b5c8b96b1..6880484bba0d8 100644 --- a/net/net/inc/TGridJDL.h +++ b/net/net/inc/TGridJDL.h @@ -14,14 +14,12 @@ #define ROOT_TGridJDL ////////////////////////////////////////////////////////////////////////// -// // -// TGridJDL // -// // -// Abstract base class to generate JDL files for job submission to the // -// Grid. // -// // -// Related classes are TGLiteJDL // -// . // +/// +/// \note This class is deprecated. It is kept for backward compatibility +/// but it should not be used in new code. +/// +/// Related classes are TGLiteJDL +/// . ////////////////////////////////////////////////////////////////////////// #include "TObject.h" diff --git a/net/net/inc/TGridJob.h b/net/net/inc/TGridJob.h index a91e8a9b17f6e..52c63444c740f 100644 --- a/net/net/inc/TGridJob.h +++ b/net/net/inc/TGridJob.h @@ -12,22 +12,22 @@ #ifndef ROOT_TGridJob #define ROOT_TGridJob -////////////////////////////////////////////////////////////////////////// -// // -// TGridJob // -// // -// Abstract base class defining interface to a GRID job. // -// // -// Related classes are TGridJobStatus. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TObject.h" #include "TString.h" class TGridJobStatus; +////////////////////////////////////////////////////////////////////////// +/// +/// Abstract base class defining interface to a GRID job. +/// +/// \note This class is deprecated. It is kept for backward compatibility +/// but it should not be used in new code. +/// +/// Related classes are TGridJobStatus. +/// +////////////////////////////////////////////////////////////////////////// class TGridJob : public TObject { protected: diff --git a/net/net/inc/TGridJobStatus.h b/net/net/inc/TGridJobStatus.h index f918c69dbc555..f1a57c2acaeec 100644 --- a/net/net/inc/TGridJobStatus.h +++ b/net/net/inc/TGridJobStatus.h @@ -12,17 +12,17 @@ #ifndef ROOT_TGridJobStatus #define ROOT_TGridJobStatus -////////////////////////////////////////////////////////////////////////// -// // -// TGridJobStatus // -// // -// Abstract base class containing the status of a Grid job. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TNamed.h" +////////////////////////////////////////////////////////////////////////// +/// +/// \note This class is deprecated. It is kept for backward compatibility +/// but it should not be used in new code. +/// +/// Abstract base class containing the status of a Grid job. +/// +////////////////////////////////////////////////////////////////////////// class TGridJobStatus : public TNamed { public: diff --git a/net/net/inc/TGridJobStatusList.h b/net/net/inc/TGridJobStatusList.h index 74e81d325e135..081586af7da27 100644 --- a/net/net/inc/TGridJobStatusList.h +++ b/net/net/inc/TGridJobStatusList.h @@ -12,14 +12,6 @@ #ifndef ROOT_TGridJobStatusList #define ROOT_TGridJobStatusList -////////////////////////////////////////////////////////////////////////// -// // -// TGridJobStatusList // -// // -// Abstract base class defining a list of GRID job status // -// // -////////////////////////////////////////////////////////////////////////// - #include "TList.h" #include "TGridJob.h" @@ -27,6 +19,14 @@ class TGridJob; +////////////////////////////////////////////////////////////////////////// +/// +/// \note This class is deprecated. It is kept for backward compatibility +/// but it should not be used in new code. +/// +/// Abstract base class defining a list of GRID job status +/// +////////////////////////////////////////////////////////////////////////// class TGridJobStatusList : public TList { protected: diff --git a/net/net/inc/TGridResult.h b/net/net/inc/TGridResult.h index e076efebb282e..faeb0179a4ad4 100644 --- a/net/net/inc/TGridResult.h +++ b/net/net/inc/TGridResult.h @@ -12,22 +12,22 @@ #ifndef ROOT_TGridResult #define ROOT_TGridResult -////////////////////////////////////////////////////////////////////////// -// // -// TGridResult // -// // -// Abstract base class defining interface to a GRID result. // -// Objects of this class are created by TGrid methods. // -// // -// Related classes are TGrid. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TList.h" class TEntryList; +////////////////////////////////////////////////////////////////////////// +/// +/// \note This class is deprecated. It is kept for backward compatibility +/// but it should not be used in new code. +/// +/// Abstract base class defining interface to a GRID result. +/// Objects of this class are created by TGrid methods. +/// +/// Related classes are TGrid. +/// +////////////////////////////////////////////////////////////////////////// class TGridResult : public TList { public: diff --git a/net/net/src/TGrid.cxx b/net/net/src/TGrid.cxx index b9c7459fe5059..0d4819f08ec4b 100644 --- a/net/net/src/TGrid.cxx +++ b/net/net/src/TGrid.cxx @@ -9,22 +9,6 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -////////////////////////////////////////////////////////////////////////// -// // -// TGrid // -// // -// Abstract base class defining interface to common GRID services. // -// // -// To open a connection to a GRID use the static method Connect(). // -// The argument of Connect() is of the form: // -// [://][:], e.g. alien://alice.cern.ch // -// Depending on the specified an appropriate plugin library // -// will be loaded which will provide the real interface. // -// // -// Related classes are TGridResult. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TGrid.h" #include "TROOT.h" #include "TPluginManager.h" diff --git a/net/net/src/TGridJDL.cxx b/net/net/src/TGridJDL.cxx index d58b419100b0e..5ba80ec545a31 100644 --- a/net/net/src/TGridJDL.cxx +++ b/net/net/src/TGridJDL.cxx @@ -10,17 +10,6 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -////////////////////////////////////////////////////////////////////////// -// // -// TGridJDL // -// // -// Abstract base class to generate JDL files for job submission to the // -// Grid. // -// // -// Related classes are TGLiteJDL. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TGridJDL.h" #include "TObjString.h" #include "Riostream.h" diff --git a/net/net/src/TGridJob.cxx b/net/net/src/TGridJob.cxx index 70ec54afacb31..be5f71cfbd371 100644 --- a/net/net/src/TGridJob.cxx +++ b/net/net/src/TGridJob.cxx @@ -9,16 +9,6 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -////////////////////////////////////////////////////////////////////////// -// // -// TGridJob // -// // -// Abstract base class defining interface to a GRID job. // -// // -// Related classes are TGridJobStatus. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TGridJob.h" diff --git a/net/net/src/TGridJobStatus.cxx b/net/net/src/TGridJobStatus.cxx index c7a3aa7483541..4cc1b0e31ed18 100644 --- a/net/net/src/TGridJobStatus.cxx +++ b/net/net/src/TGridJobStatus.cxx @@ -9,14 +9,6 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -////////////////////////////////////////////////////////////////////////// -// // -// TGridJobStatus // -// // -// Abstract base class containing the status of a Grid job. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TGridJobStatus.h" diff --git a/net/net/src/TGridJobStatusList.cxx b/net/net/src/TGridJobStatusList.cxx index 1430134955dfd..71e6e2d97a2aa 100644 --- a/net/net/src/TGridJobStatusList.cxx +++ b/net/net/src/TGridJobStatusList.cxx @@ -9,14 +9,6 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -////////////////////////////////////////////////////////////////////////// -// // -// TGridJobStatusList // -// // -// Abstract base class defining a list of GRID job status // -// // -////////////////////////////////////////////////////////////////////////// - #include "TGridJobStatusList.h" TGridJobStatusList *gGridJobStatusList = 0; diff --git a/net/net/src/TGridResult.cxx b/net/net/src/TGridResult.cxx index 6a39822002938..7600153b83a62 100644 --- a/net/net/src/TGridResult.cxx +++ b/net/net/src/TGridResult.cxx @@ -9,16 +9,5 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -////////////////////////////////////////////////////////////////////////// -// // -// TGridResult // -// // -// Abstract base class defining interface to a GRID result. // -// Objects of this class are created by TGrid methods. // -// // -// Related classes are TGrid. // -// // -////////////////////////////////////////////////////////////////////////// - #include "TGridResult.h"