diff --git a/Database/APR/CollectionBase/CMakeLists.txt b/Database/APR/CollectionBase/CMakeLists.txt
index fb6154748c964c064b6423557da3a41b3ee3e328..1bc4a72478411455053956082622d1cd083eeb31 100644
--- a/Database/APR/CollectionBase/CMakeLists.txt
+++ b/Database/APR/CollectionBase/CMakeLists.txt
@@ -9,6 +9,7 @@ atlas_subdir( CollectionBase )
atlas_depends_on_subdirs( PUBLIC
Database/APR/POOLCore
PRIVATE
+ Database/APR/FileCatalog
AtlasTest/TestTools
Database/APR/PersistencySvc
Database/PersistentDataModel
@@ -25,7 +26,9 @@ atlas_add_library( CollectionBase
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES}
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools POOLCore PersistencySvc PersistentDataModel GaudiKernel )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools
+ POOLCore PersistencySvc PersistentDataModel
+ GaudiKernel FileCatalog )
atlas_add_dictionary( CollectionDict
CollectionBase/CollectionDict.h
diff --git a/Database/APR/CollectionBase/CollectionBase/CollectionFactory.h b/Database/APR/CollectionBase/CollectionBase/CollectionFactory.h
index df9663178f17c881a7dfbbbe42b08aaad9e07a26..3c77051ffebe5ee65a4e65f6f38808cec70c49d3 100755
--- a/Database/APR/CollectionBase/CollectionBase/CollectionFactory.h
+++ b/Database/APR/CollectionBase/CollectionBase/CollectionFactory.h
@@ -7,7 +7,7 @@
#include "CollectionBase/ICollection.h"
#include "CollectionBase/CollectionDescription.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/IFileCatalog.h"
#include <string>
#include <vector>
diff --git a/Database/APR/CollectionBase/src/CollectionFactory.cpp b/Database/APR/CollectionBase/src/CollectionFactory.cpp
index 6effde0172ed61c3e2d076cf8178ead52d01e044..698bf33d0246baeca199d073544fc43c1c40e482 100755
--- a/Database/APR/CollectionBase/src/CollectionFactory.cpp
+++ b/Database/APR/CollectionBase/src/CollectionFactory.cpp
@@ -9,7 +9,7 @@
#include "CollectionBase/CollectionBaseNames.h"
#include "CollectionBase/boost_tokenizer_headers.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/IFileCatalog.h"
#include "POOLCore/Exception.h"
#include "Gaudi/PluginService.h"
diff --git a/Database/APR/CollectionBase/src/CollectionService.cpp b/Database/APR/CollectionBase/src/CollectionService.cpp
index 1627004f18dfebe724f3a17610d5d06edcc60ce3..2cc4edefcb4ab95b05eb9adc4982d84ef2e8112f 100755
--- a/Database/APR/CollectionBase/src/CollectionService.cpp
+++ b/Database/APR/CollectionBase/src/CollectionService.cpp
@@ -8,8 +8,8 @@
#include "CollectionBase/ICollectionCursor.h"
#include "CollectionBase/boost_tokenizer_headers.h"
-#include "POOLCore/IFileCatalog.h"
-#include "CoralBase/MessageStream.h"
+#include "POOLCore/Exception.h"
+#include "FileCatalog/IFileCatalog.h"
#include <cstring>
diff --git a/Database/APR/CollectionBase/test/Factory_test.cxx b/Database/APR/CollectionBase/test/Factory_test.cxx
index 5d8cadcea6c14e1b8461962ec10e716234b4e762..9894b9a1f96f786683524fbbc151aedf826229c5 100644
--- a/Database/APR/CollectionBase/test/Factory_test.cxx
+++ b/Database/APR/CollectionBase/test/Factory_test.cxx
@@ -9,7 +9,7 @@
#include "PersistentDataModel/Token.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/IFileCatalog.h"
#include "CollectionBase/ICollection.h"
#include "CollectionBase/CollectionDescription.h"
diff --git a/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp b/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp
index 683c670b458fcb7b0231b9f5ccce9adfeaa568a6..816711283db244ab9f8dfd3572854d1dc143f266 100644
--- a/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp
+++ b/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp
@@ -12,9 +12,6 @@
#include "CollectionBase/ICollection.h"
#include "CollectionBase/ICollectionMetadata.h"
-#include "FileCatalog/IFileCatalog.h"
-#include "FileCatalog/IFCAction.h"
-
#include "CoralBase/MessageStream.h"
#include "POOLCore/Exception.h"
@@ -26,11 +23,7 @@
#include <xercesc/dom/DOM.hpp>
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
-#if XERCES_VERSION_MAJOR < 3
-#include <xercesc/dom/DOMWriter.hpp>
-#else
#include <xercesc/dom/DOMLSSerializer.hpp>
-#endif
#include <xercesc/dom/DOMNode.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
@@ -194,33 +187,6 @@ int main(int argc, const char *argv[])
++metit;
}
}
-
-#if XERCES_VERSION_MAJOR < 3
- // get a writer instance
- DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);
-
- // set a target as the file argument
- //std::string file("CollMetadata.xml");
- std::cout << "About to write summary file " << file << std::endl;
- XMLFormatTarget* myFormTarget = new LocalFileFormatTarget(file.c_str());
-
- // write document to target
- theSerializer->writeNode(myFormTarget, *newDocument);
-
- // clean up the mess
- if (theSerializer!=NULL && theSerializer!=0) delete theSerializer;
- if (myFormTarget!=NULL && myFormTarget!=0) delete myFormTarget;
- if (newDocument!=NULL && newDocument!=0) delete newDocument;
-#else
// get a writer instance
DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
@@ -249,7 +215,6 @@ int main(int argc, const char *argv[])
if (theOutput!=NULL) delete theOutput;
if (myFormTarget!=NULL) delete myFormTarget;
if (newDocument!=NULL) delete newDocument;
-#endif
}
catch (const SAXException& e) {
std::cout << "xml error: " << e.getMessage( ) << "\n";
diff --git a/Database/APR/CollectionUtilities/utilities/CollListPFN.cpp b/Database/APR/CollectionUtilities/utilities/CollListPFN.cpp
index df7161c280a1144f4d9e294ab09aac4addb95289..1ea6767673ff8c262328e9ac629f9d9598dc982f 100644
--- a/Database/APR/CollectionUtilities/utilities/CollListPFN.cpp
+++ b/Database/APR/CollectionUtilities/utilities/CollListPFN.cpp
@@ -20,7 +20,6 @@
#include "CollectionBase/ICollection.h"
#include "FileCatalog/IFileCatalog.h"
-#include "FileCatalog/IFCAction.h"
#include "POOLCore/Exception.h"
#include "CoralBase/MessageStream.h"
@@ -95,13 +94,7 @@ int main(int argc, const char *argv[])
// new GUID
std::string bestPFN;
std::string fileType;
- pool::IFCAction action;
- FC.setAction( action );
- action.lookupBestPFN( dbFileId,
- pool::FileCatalog::READ,
- pool::FileCatalog::SEQUENTIAL,
- bestPFN,
- fileType );
+ FC.getFirstPFN( dbFileId, bestPFN, fileType );
if( bestPFN.size() ) {
// found a name
guidToPfn[ dbFileId ] = bestPFN;
diff --git a/Database/APR/CollectionUtilities/utilities/CollRemove.cpp b/Database/APR/CollectionUtilities/utilities/CollRemove.cpp
index 0d558443c78c4e151c79a34161233d9278dd5800..5f0bbc3c4d72a82f45bb4924ac902da01a55b122 100644
--- a/Database/APR/CollectionUtilities/utilities/CollRemove.cpp
+++ b/Database/APR/CollectionUtilities/utilities/CollRemove.cpp
@@ -11,9 +11,6 @@
#include "CollectionBase/CollectionService.h"
#include "CollectionBase/ICollection.h"
-#include "FileCatalog/IFileCatalog.h"
-#include "FileCatalog/IFCAction.h"
-
#include "CoralBase/MessageStream.h"
#include "POOLCore/Exception.h"
diff --git a/Database/APR/CollectionUtilities/utilities/coll_insertGuidToCatalog.cpp b/Database/APR/CollectionUtilities/utilities/coll_insertGuidToCatalog.cpp
index c3a11de8303f555302e22d39dfaa806ec43baa16..7b3a014e0e9feadb63d2b15aa3434e28d9474847 100644
--- a/Database/APR/CollectionUtilities/utilities/coll_insertGuidToCatalog.cpp
+++ b/Database/APR/CollectionUtilities/utilities/coll_insertGuidToCatalog.cpp
@@ -8,9 +8,6 @@
#include "PersistentDataModel/Guid.h"
#include "FileCatalog/IFileCatalog.h"
-#include "FileCatalog/FCLeaf.h"
-#include "FileCatalog/FCImpl.h"
-#include "FileCatalog/FCEntry.h"
#include "FileCatalog/URIParser.h"
class InsertFileToCatalogApplication {
@@ -109,13 +106,7 @@ InsertFileToCatalogApplication::execute()
catalog->setWriteCatalog( p.contactstring() );
catalog->connect();
catalog->start();
-
- pool::PFNEntry entry( m_fileNames[0], m_guid, m_technologyName );
- pool::FCLeaf* leaf =
- dynamic_cast< pool::FCLeaf* >( catalog->getWriteCatalog() );
- if (leaf)
- leaf->getImpl()->insertPFN( entry );
-
+ catalog->registerPFN( m_guid, m_fileNames[0], m_technologyName );
catalog->commit();
}
}
diff --git a/Database/APR/FileCatalog/FileCatalog/URIParser.h b/Database/APR/FileCatalog/FileCatalog/URIParser.h
index 34d6b1c1dd4a64e8c0ee6df0631e74e9677a6273..45afb0472dae18078c2b9a25b2148ba928d19764 100755
--- a/Database/APR/FileCatalog/FileCatalog/URIParser.h
+++ b/Database/APR/FileCatalog/FileCatalog/URIParser.h
@@ -8,7 +8,7 @@
#include <string>
namespace pool{
- /**@class URIParser URIParser.h Database/APR/POOLCore/URIParser.h
+ /**@class URIParser URIParser.h Database/APR/FileCatalog/URIParser.h
URI parsing utility class.
The URI string can be read from environment variable POOL_CATALOG
or from the URIParser constructor.
diff --git a/Database/APR/FileCatalog/src/IFileCatalog.cpp b/Database/APR/FileCatalog/src/IFileCatalog.cpp
index cf51b5d6c815b58101c76ec74e21dccc6d856b06..1fdf576244ef93f014fd4f1eb28ccf737b9b1c64 100644
--- a/Database/APR/FileCatalog/src/IFileCatalog.cpp
+++ b/Database/APR/FileCatalog/src/IFileCatalog.cpp
@@ -11,12 +11,10 @@
#include <algorithm>
#include "POOLCore/SystemTools.h"
#include "POOLCore/Exception.h"
-
#include "FileCatalog/URIParser.h"
#include "FileCatalog/IFileCatalog.h"
#include "AthenaBaseComps/AthMessaging.h"
-#include "GaudiKernel/IMessageSvc.h"
#include <iostream>
@@ -25,12 +23,9 @@ using namespace pool;
pool::IFileCatalog::IFileCatalog()
: AthMessaging( Gaudi::svcLocator()->service<IMessageSvc>("MessageSvc").get(), "APRFileCatalog" )
{
- Gaudi::svcLocator()->service<IMessageSvc>("MessageSvc")->setOutputLevel("XMLCatalog", MSG::WARNING );
_mgr = Gaudi::svcLocator()->service<Gaudi::IFileCatalogMgr>( "Gaudi::MultiFileCatalog" );
_fc = _mgr;
- msg().setLevel( SystemTools::GetOutputLvl() );
- std::cout << "IFileCatalog MSGLVL=" << SystemTools::GetOutputLvl() << std::endl;
- //Gaudi::svcLocator()->service<IMessageSvc>("MessageSvc")->setOutputLevel("XMLCatalog", SystemTools::GetOutputLvl() );
+ setLevel( SystemTools::GetOutputLvl() );
}
@@ -73,6 +68,7 @@ registerPFN( const std::string& pfn, const std::string& ftype, std::string& fid
if( existsPFN(pfn) ) {
throw pool::Exception(std::string("PFN '") + pfn + "' already registered", "registerPFN", "FileCatalog");
}
+// std::cout << "msg() level" << msg().level() << std::endl;
ATH_MSG_DEBUG("Registering PFN=" << pfn << " of type=" << ftype << " GUID=" << fid);
if( fid.empty() ) fid = createFID();
_fc->registerPFN(fid, pfn, ftype);
diff --git a/Database/APR/PersistencySvc/utilities/pool_insertFileToCatalog.cpp b/Database/APR/PersistencySvc/utilities/pool_insertFileToCatalog.cpp
index 7d215fa43271f58cc438693d6bd059777b6026d3..edecd246063c72274e7865438dd8a06b277ad9f5 100644
--- a/Database/APR/PersistencySvc/utilities/pool_insertFileToCatalog.cpp
+++ b/Database/APR/PersistencySvc/utilities/pool_insertFileToCatalog.cpp
@@ -58,7 +58,7 @@ InsertFileToCatalogApplication::parseArguments()
return SimpleUtilityBase::parseArguments();
}
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
void
InsertFileToCatalogApplication::execute()
diff --git a/Database/APR/RootCollection/CMakeLists.txt b/Database/APR/RootCollection/CMakeLists.txt
index f4de8bdbfb091a8a8ea62ffedfb4984cdb020ef3..a27d70653a7a2adbcba94acc67fc0439a4f6b527 100644
--- a/Database/APR/RootCollection/CMakeLists.txt
+++ b/Database/APR/RootCollection/CMakeLists.txt
@@ -12,6 +12,7 @@ atlas_depends_on_subdirs( PRIVATE
Control/RootUtils
Database/APR/CollectionBase
Database/APR/POOLCore
+ Database/APR/FileCatalog
Database/APR/PersistencySvc
Database/PersistentDataModel
GaudiKernel )
@@ -33,7 +34,10 @@ atlas_add_library( RootCollection
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} RootUtilsPyROOT
- PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} TestTools AthenaKernel RootUtils CollectionBase POOLCore PersistencySvc PersistentDataModel GaudiKernel )
+ PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} TestTools
+ AthenaKernel RootUtils CollectionBase POOLCore
+ PersistencySvc PersistentDataModel GaudiKernel
+ FileCatalog )
atlas_add_library( RootCollectionComponents
src/components/*.cpp
diff --git a/Database/APR/RootCollection/src/RootCollection.cpp b/Database/APR/RootCollection/src/RootCollection.cpp
index ef38b9f63bd6d7328c3e86b8810e3690a63588f7..cdbb27eb42fd7c464f5a234ba05bb87a8c90def9 100755
--- a/Database/APR/RootCollection/src/RootCollection.cpp
+++ b/Database/APR/RootCollection/src/RootCollection.cpp
@@ -7,6 +7,7 @@
#include "RootCollectionMetadata.h"
#include "PersistentDataModel/Token.h"
+#include "POOLCore/Exception.h"
#include "CollectionBase/ICollectionColumn.h"
#include "CollectionBase/ICollectionFragment.h"
diff --git a/Database/APR/RootCollection/src/RootCollection.h b/Database/APR/RootCollection/src/RootCollection.h
index b1f9d3ce11721d80e116032792816c4854f8a515..90fa4cd85a255de1f31b45f8549ade2a283783c1 100755
--- a/Database/APR/RootCollection/src/RootCollection.h
+++ b/Database/APR/RootCollection/src/RootCollection.h
@@ -11,7 +11,7 @@
#include "CollectionBase/ICollection.h"
#include "CollectionBase/CollectionDescription.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/IFileCatalog.h"
#include "CoralBase/MessageStream.h"
#include "GaudiKernel/IFileMgr.h"
diff --git a/Database/APR/RootStorageSvc/CMakeLists.txt b/Database/APR/RootStorageSvc/CMakeLists.txt
index 9c2b6d8e62d1d5ca498495674f00a1aef829e995..beabda2ad977a6f6874576f6e3d18f9c52aa8f9f 100644
--- a/Database/APR/RootStorageSvc/CMakeLists.txt
+++ b/Database/APR/RootStorageSvc/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PRIVATE
Control/AthContainers
Control/AthContainersInterfaces
Control/RootUtils
+ Database/APR/POOLCore
Database/APR/StorageSvc
Database/AthenaRoot/RootAuxDynIO
Database/PersistentDataModel
@@ -23,10 +24,10 @@ find_package( ROOT COMPONENTS Core RIO TreePlayer Tree MathCore Hist pthread )
atlas_add_library( RootStorageSvc
src/*.cpp
NO_PUBLIC_HEADERS
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} POOLCore
LINK_LIBRARIES ${ROOT_LIBRARIES} RootUtilsPyROOT
PRIVATE_LINK_LIBRARIES TestTools AthContainers
- RootUtils StorageSvc RootAuxDynIO
+ RootUtils StorageSvc RootAuxDynIO POOLCore
PersistentDataModel GaudiKernel )
diff --git a/Database/APR/RootStorageSvc/src/RootDatabase.cpp b/Database/APR/RootStorageSvc/src/RootDatabase.cpp
index 8bf51c006b2c8e4944519169a88bad14e8098529..e2fa30d50655c9c6f72b79d60245467c004fcc98 100644
--- a/Database/APR/RootStorageSvc/src/RootDatabase.cpp
+++ b/Database/APR/RootStorageSvc/src/RootDatabase.cpp
@@ -16,7 +16,7 @@
#include "StorageSvc/DbDatabase.h"
#include "StorageSvc/DbOption.h"
#include "StorageSvc/DbDomain.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/DbTransaction.h"
#include "GaudiKernel/Bootstrap.h"
diff --git a/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp b/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp
index 3e32206a2043e2be2dc7293d7fff3ed82ed63eac..b59ffe950aa2fef089549840326ae99b67c493fc 100755
--- a/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp
+++ b/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp
@@ -11,7 +11,7 @@
// Author : M.Frank
//====================================================================
// Framework include files
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/DbOption.h"
#include "StorageSvc/DbSelect.h"
diff --git a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
index 2436d841e57edcdfc41fdec78ae63ce641a7d896..9132f39571c63a59069f86b6117a19412c3c3291 100755
--- a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
+++ b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
@@ -21,7 +21,7 @@
#include "StorageSvc/DbInstanceCount.h"
#include "StorageSvc/DataCallBack.h"
#include "StorageSvc/DbArray.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/DbTransaction.h"
#include "StorageSvc/DbReflex.h"
diff --git a/Database/APR/StorageSvc/src/DbContainerImp.cpp b/Database/APR/StorageSvc/src/DbContainerImp.cpp
index cfb7776fb214127651b4ed88cb333ec12172470b..8fdadc0847a122018f5de2c19855ddd28978d932 100644
--- a/Database/APR/StorageSvc/src/DbContainerImp.cpp
+++ b/Database/APR/StorageSvc/src/DbContainerImp.cpp
@@ -12,7 +12,7 @@
//====================================================================
/// Framework include files
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/DbHeap.h"
#include "StorageSvc/DbSelect.h"
#include "StorageSvc/DbContainer.h"
diff --git a/Database/APR/StorageSvc/src/DbContainerObj.cpp b/Database/APR/StorageSvc/src/DbContainerObj.cpp
index ac24ec6905d2ac9cb5e7d6ae5dab132f13a62d45..9a2d84dcff8fc5628574311c63ace61e4ef4a6e9 100644
--- a/Database/APR/StorageSvc/src/DbContainerObj.cpp
+++ b/Database/APR/StorageSvc/src/DbContainerObj.cpp
@@ -16,7 +16,7 @@
// Framework include files
#include "DbContainerObj.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/IOODatabase.h"
#include "StorageSvc/IDbContainer.h"
#include "StorageSvc/DbDomain.h"
diff --git a/Database/APR/StorageSvc/src/DbDatabaseObj.cpp b/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
index 3b1c50f3c69461c52f2e6487521046d8b419eaa8..64f08fa793b1356740702e4759fb8de6fadda0c0 100644
--- a/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
+++ b/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
@@ -18,7 +18,7 @@
#include "DbContainerObj.h"
// Public POOL include files
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/DbIter.h"
#include "StorageSvc/DbToken.h"
#include "StorageSvc/DbReflex.h"
diff --git a/Database/APR/StorageSvc/src/DbDomainObj.cpp b/Database/APR/StorageSvc/src/DbDomainObj.cpp
index 474917b2e677f1940dbdceac7eac46549058cc02..05fe64cecbb779663c59ff70ed71e68fb522663c 100644
--- a/Database/APR/StorageSvc/src/DbDomainObj.cpp
+++ b/Database/APR/StorageSvc/src/DbDomainObj.cpp
@@ -20,7 +20,7 @@
#include "StorageSvc/IDbDomain.h"
#include "StorageSvc/IOODatabase.h"
#include "StorageSvc/DbInstanceCount.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "DbDatabaseObj.h"
#include "DbDomainObj.h"
diff --git a/Database/APR/StorageSvc/src/DbReflex.cpp b/Database/APR/StorageSvc/src/DbReflex.cpp
index 2f432e353a42c1b0d548613a3883497efc9fd1c0..b7b96a43c904396d0f93154d01351b82dfe2966b 100644
--- a/Database/APR/StorageSvc/src/DbReflex.cpp
+++ b/Database/APR/StorageSvc/src/DbReflex.cpp
@@ -11,7 +11,7 @@
#include "StorageSvc/DbReflex.h"
#include "StorageSvc/DbTypeInfo.h"
#include "StorageSvc/DbTransform.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include <cstring>
diff --git a/Database/APR/StorageSvc/src/DbSelect.cpp b/Database/APR/StorageSvc/src/DbSelect.cpp
index 84a9686b807d6af797b87ecc29556023a18e2dfa..293c9ee6bb2bc84ca23a06c3c7bde8dd861c1f76 100644
--- a/Database/APR/StorageSvc/src/DbSelect.cpp
+++ b/Database/APR/StorageSvc/src/DbSelect.cpp
@@ -14,7 +14,7 @@
// Framework include files
#include "PersistentDataModel/Guid.h"
#include "PersistentDataModel/Token.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/DbSelect.h"
#include "StorageSvc/DbDatabase.h"
#include "StorageSvc/DbContainer.h"
diff --git a/Database/APR/StorageSvc/src/DbSessionObj.cpp b/Database/APR/StorageSvc/src/DbSessionObj.cpp
index c26794cd9a4d60b3f3afb4abcaa71a436843f888..364c4657aac3298f5e8fc48ce7438d9fae0d9d6e 100644
--- a/Database/APR/StorageSvc/src/DbSessionObj.cpp
+++ b/Database/APR/StorageSvc/src/DbSessionObj.cpp
@@ -16,7 +16,7 @@
// Framework include files
#include "DbSessionObj.h"
#include "DbDomainObj.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/IOODatabase.h"
#include "StorageSvc/DbInstanceCount.h"
diff --git a/Database/APR/StorageSvc/src/DbStorageExplorer.cpp b/Database/APR/StorageSvc/src/DbStorageExplorer.cpp
index 5c4601b26a44564b245e037146672e137177f89f..660bb9d6a2afaf8ccce421a139a987f2e25c43ad 100644
--- a/Database/APR/StorageSvc/src/DbStorageExplorer.cpp
+++ b/Database/APR/StorageSvc/src/DbStorageExplorer.cpp
@@ -24,7 +24,7 @@
#include "StorageSvc/DbConnection.h"
#include "StorageSvc/DbTypeInfo.h"
#include "StorageSvc/FileDescriptor.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include <memory>
#include <stdexcept>
diff --git a/Database/APR/StorageSvc/src/DbStorageSvc.cpp b/Database/APR/StorageSvc/src/DbStorageSvc.cpp
index cded3110ba6be66ca392ddc92c1106e13ee5f314..9f4bf1a550e2068d0ef14130e57e48fed9b7c2c5 100644
--- a/Database/APR/StorageSvc/src/DbStorageSvc.cpp
+++ b/Database/APR/StorageSvc/src/DbStorageSvc.cpp
@@ -17,7 +17,7 @@
#include "PersistentDataModel/Token.h"
#include "DbStorageSvc.h"
#include "DbStorageExplorer.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include "StorageSvc/DbToken.h"
#include "StorageSvc/DbSelect.h"
#include "StorageSvc/DbReflex.h"
diff --git a/Database/APR/StorageSvc/src/DbType.cpp b/Database/APR/StorageSvc/src/DbType.cpp
index 56d7c0f5e2171654723f83fac3578f978cecdb4c..bbeac4c4863b7437bf0683e5489876e32e2665ab 100644
--- a/Database/APR/StorageSvc/src/DbType.cpp
+++ b/Database/APR/StorageSvc/src/DbType.cpp
@@ -11,7 +11,7 @@
#include "StorageSvc/pool.h"
#include "StorageSvc/DbType.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include <cstdio>
using namespace pool;
diff --git a/Database/APR/Tests/CMakeLists.txt b/Database/APR/Tests/CMakeLists.txt
index 276222d2719a1d7a99ca535a2a9ac4927918a731..e393a092b70ec431c52620c13fa858b75c5bea2c 100644
--- a/Database/APR/Tests/CMakeLists.txt
+++ b/Database/APR/Tests/CMakeLists.txt
@@ -9,6 +9,8 @@ atlas_subdir( Tests )
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PRIVATE
+ Database/APR/POOLCore
+ Database/APR/FileCatalog
Database/APR/PersistencySvc
Database/APR/StorageSvc
Database/PersistentDataModel
@@ -50,7 +52,7 @@ function( _add_test name )
SOURCES ${name}/*.cpp
INCLUDE_DIRS ${CPPUNIT_INCLUDE_DIRS}
LINK_LIBRARIES ${CPPUNIT_LIBRARIES} PersistencySvc
- StorageSvc AthContainers
+ StorageSvc AthContainers FileCatalog
PersistentDataModel TestTools
PRE_EXEC_SCRIPT "rm -f pool*.root *xml"
POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post.sh ${name}_test"
diff --git a/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp b/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp
index c7757a8e659cb1c9f4f264875ba03199f73a467e..c2a63c9422a3ba6b04ac81e3f5edcd5a574b2179 100644
--- a/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp
+++ b/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp
@@ -11,7 +11,8 @@
#include <string>
#include <iostream>
#include <cstdlib>
-#include "POOLCore/IFileCatalog.h"
+#include "POOLCore/Exception.h"
+#include "FileCatalog/IFileCatalog.h"
using namespace pool;
diff --git a/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp
index db3a5a0132faf8988735ce670d4daba4b7e4117f..8bdea7e3b0e246b22002daf4c06056c5029c6155 100644
--- a/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp
@@ -14,8 +14,8 @@
#include "PersistentDataModel/Token.h"
#include "StorageSvc/DbType.h"
-#include "POOLCore/URIParser.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/URIParser.h"
+#include "FileCatalog/IFileCatalog.h"
#include "PersistencySvc/ISession.h"
#include "PersistencySvc/ITransaction.h"
diff --git a/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp
index 9cf84916e7020f0287cc9e662e6c8b4afde6666d..13c2c96d461b8a81a6857e4b4510aa69d5efc5e1 100644
--- a/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp
@@ -14,8 +14,8 @@
#include "PersistentDataModel/Token.h"
#include "StorageSvc/DbType.h"
-#include "POOLCore/URIParser.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/URIParser.h"
+#include "FileCatalog/IFileCatalog.h"
#include "PersistencySvc/ISession.h"
#include "PersistencySvc/ITransaction.h"
diff --git a/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp
index 55154166c213e18a7f7e7eed6e530a2aecb4237e..536cf31adc754bf4477ccdc7a4eddc4598a959d1 100644
--- a/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp
@@ -14,8 +14,8 @@
#include "PersistentDataModel/Token.h"
#include "StorageSvc/DbType.h"
-#include "POOLCore/URIParser.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/URIParser.h"
+#include "FileCatalog/IFileCatalog.h"
#include "PersistencySvc/ISession.h"
#include "PersistencySvc/ITransaction.h"
diff --git a/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp
index d908458425e20bc986e4a219b6a1152cf30dbb34..a801099b906994e5fec81e539a2e85c10a60876b 100644
--- a/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp
@@ -14,8 +14,8 @@
#include "PersistentDataModel/Token.h"
#include "StorageSvc/DbType.h"
-#include "POOLCore/URIParser.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/URIParser.h"
+#include "FileCatalog/IFileCatalog.h"
#include "PersistencySvc/ISession.h"
#include "PersistencySvc/ITransaction.h"
diff --git a/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp
index cdd18dd71e7ab6667af100391e1223bb70b1bf53..07bc927da9b4860e5cb7312983c349e6dfaa8f92 100644
--- a/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp
@@ -9,8 +9,8 @@
#include <memory>
#include "StorageSvc/DbType.h"
-#include "POOLCore/URIParser.h"
-#include "POOLCore/IFileCatalog.h"
+#include "FileCatalog/URIParser.h"
+#include "FileCatalog/IFileCatalog.h"
#include "PersistencySvc/ISession.h"
#include "PersistencySvc/ITransaction.h"
diff --git a/Database/APR/Tests/StorageSvc_AuxStore/TestDriver.cpp b/Database/APR/Tests/StorageSvc_AuxStore/TestDriver.cpp
index 33c7e084d1a3949a2ffe1cde9778dd29c62cf402..3479b626549a931ff1c5501e017a7a8b994d9b95 100755
--- a/Database/APR/Tests/StorageSvc_AuxStore/TestDriver.cpp
+++ b/Database/APR/Tests/StorageSvc_AuxStore/TestDriver.cpp
@@ -20,7 +20,7 @@
#include "StorageSvc/DatabaseConnection.h"
#include "StorageSvc/FileDescriptor.h"
#include "StorageSvc/DbType.h"
-#include "StorageSvc/DbPrint.h"
+#include "POOLCore/DbPrint.h"
#include <stdexcept>
#include <iostream>