Commit f5dd0431 authored by Nikola Hardi's avatar Nikola Hardi
Browse files

Introduce TAliceFile and TAliceCollection

parent bdf7f812
......@@ -19,12 +19,16 @@ message(STATUS "Using same ROOT CXX flags: ${CMAKE_CXX_FLAGS}")
# This is our library's name
set(LIBNAME JAliEnROOT)
include_directories(${LIBNAME} ${OPENSSL_INCLUDE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/inc)
include_directories(${AGU}/include)
file(GLOB SRCS "src/*.cxx")
string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
string(REPLACE "src" "inc" HDRS "${HDRS}")
include_directories(${LIBNAME} ${OPENSSL_INCLUDE_DIR})
set(HDRS ${HDRS} "${AGU}/include/TAliceCollection.h" "${AGU}/include/TAliceFile.h")
ROOT_GENERATE_DICTIONARY(G__${LIBNAME} "${HDRS}" LINKDEF LinkDef.h)
add_library(${LIBNAME} SHARED "${SRCS}" G__${LIBNAME}.cxx)
target_link_libraries(${LIBNAME} ${ROOT_LIBRARIES} json-c websockets ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
......
......@@ -21,7 +21,7 @@
//////////////////////////////////////////////////////////////////////////
#ifndef ROOT_TGridCollection
#include "TGridCollection.h"
#include "TAliceCollection.h"
#endif
#ifndef ROOT_TString
#include "TString.h"
......@@ -33,7 +33,7 @@
#include "TFileStager.h"
#endif
class TJAlienCollection : public TGridCollection {
class TJAlienCollection : public TAliceCollection {
private:
TString fXmlFile; // collection XML file
......
......@@ -9,12 +9,12 @@
#define ROOT_TJAlienFile
#ifndef ROOT_TXNetFile
#include "TXNetFile.h"
#include "TAliceFile.h"
#endif
class TUrl;
class TJAlienFile : public TXNetFile {
class TJAlienFile : public TAliceFile {
private:
TString fLfn; // logical file name
......@@ -29,7 +29,7 @@ private:
Long64_t fOpenedAt; // Absolute value for time when opened
Double_t fElapsed; // Time elapsed to opem file
public:
TJAlienFile() : TXNetFile(), fLfn(), fAuthz(), fGUID(), fUrl(), fPfn(), fSE(), fNreplicas(0), fOpenedAt(0), fElapsed(0) { }
TJAlienFile() : TAliceFile(), fLfn(), fAuthz(), fGUID(), fUrl(), fPfn(), fSE(), fNreplicas(0), fOpenedAt(0), fElapsed(0) { }
TJAlienFile(const char *purl, Option_t *option = "",
const char *ftitle = "", Int_t compress = 1,
Bool_t parallelopen = kFALSE, const char *lurl = 0,
......
......@@ -30,7 +30,7 @@ TJAlienFile::TJAlienFile(const char *purl, Option_t *option,
const char *ftitle, Int_t compress,
Bool_t parallelopen, const char *lurl,
const char *authz) :
TXNetFile(purl, option, ftitle, compress, 0, parallelopen, lurl) {
TAliceFile(purl, option, ftitle, compress, 0, parallelopen, lurl) {
TUrl logicalUrl(lurl);
fLfn = logicalUrl.GetFile();
fAuthz = authz;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment