Migrate to DECLARE_COMPONENT macros

A few constructors had to be made public as required by the Gaudi Plugin
service.

AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx

 #include "AthenaDBTestRec/TestCoolRecRead.h"
 #include "AthenaDBTestRec/DetStoreDump.h"
 
-DECLARE_ALGORITHM_FACTORY( TestCoolRecRead )
-DECLARE_ALGORITHM_FACTORY( DetStoreDump )
+DECLARE_COMPONENT( TestCoolRecRead )
+DECLARE_COMPONENT( DetStoreDump )
 

AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx

@@ -10,15 +10,15 @@
 #include "../RunEventMetaWriter.h"
 #include "../DummyLumirangeTool.h"
 
-DECLARE_ALGORITHM_FACTORY(StoreDump)
-DECLARE_ALGORITHM_FACTORY(PassAllFilter)
-DECLARE_ALGORITHM_FACTORY(PassNoneFilter)
-DECLARE_ALGORITHM_FACTORY(AddTrigMap)
-DECLARE_ALGORITHM_FACTORY(EventSplit)
-DECLARE_ALGORITHM_FACTORY(EventTagReader)
-DECLARE_ALGORITHM_FACTORY(EventTagWriter)
-DECLARE_ALGORITHM_FACTORY(TagEventTagWriter)
-DECLARE_ALGORITHM_FACTORY(RunEventTagWriter)
-DECLARE_ALGORITHM_FACTORY(RunEventMetaWriter)
-DECLARE_ALGORITHM_FACTORY(DummyLumirangeTool)
+DECLARE_COMPONENT( StoreDump )
+DECLARE_COMPONENT( PassAllFilter )
+DECLARE_COMPONENT( PassNoneFilter )
+DECLARE_COMPONENT( AddTrigMap )
+DECLARE_COMPONENT( EventSplit )
+DECLARE_COMPONENT( EventTagReader )
+DECLARE_COMPONENT( EventTagWriter )
+DECLARE_COMPONENT( TagEventTagWriter )
+DECLARE_COMPONENT( RunEventTagWriter )
+DECLARE_COMPONENT( RunEventMetaWriter )
+DECLARE_COMPONENT( DummyLumirangeTool )
 

AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx

@@ -15,20 +15,20 @@
 #include "../PileUpEventInfoWriter.h"
 #include "../PileUpEventInfoReader.h"
 
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataWriter)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataReader)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrWriter)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrReader)
-// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeWriter)
-// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeReader)
-DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeWriter)
-DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeReader)
-DECLARE_ALGORITHM_FACTORY(TrkTrackFakeWriter)
-DECLARE_ALGORITHM_FACTORY(TrkTrackFakeReader)
-DECLARE_ALGORITHM_FACTORY(LArCellContFakeWriter)
-DECLARE_ALGORITHM_FACTORY(LArCellContFakeReader)
-DECLARE_ALGORITHM_FACTORY(EventInfoWriter)
-DECLARE_ALGORITHM_FACTORY(EventInfoReader)
-DECLARE_ALGORITHM_FACTORY(PileUpEventInfoWriter)
-DECLARE_ALGORITHM_FACTORY(PileUpEventInfoReader)
+DECLARE_COMPONENT( AthenaPoolTestDataWriter )
+DECLARE_COMPONENT( AthenaPoolTestDataReader )
+DECLARE_COMPONENT( AthenaPoolTestAttrWriter )
+DECLARE_COMPONENT( AthenaPoolTestAttrReader )
+// DECLARE_COMPONENT( CaloClusterFakeWriter )
+// DECLARE_COMPONENT( CaloClusterFakeReader )
+DECLARE_COMPONENT( InDetRawDataFakeWriter )
+DECLARE_COMPONENT( InDetRawDataFakeReader )
+DECLARE_COMPONENT( TrkTrackFakeWriter )
+DECLARE_COMPONENT( TrkTrackFakeReader )
+DECLARE_COMPONENT( LArCellContFakeWriter )
+DECLARE_COMPONENT( LArCellContFakeReader )
+DECLARE_COMPONENT( EventInfoWriter )
+DECLARE_COMPONENT( EventInfoReader )
+DECLARE_COMPONENT( PileUpEventInfoWriter )
+DECLARE_COMPONENT( PileUpEventInfoReader )
 

AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx

 #include "IOVDbTestAlg/IOVDbTestAlg.h"
 #include "IOVDbTestAlg/IOVDbTestCoolDCS.h"
 
-DECLARE_ALGORITHM_FACTORY(IOVDbTestAlg)
-DECLARE_ALGORITHM_FACTORY(IOVDbTestCoolDCS)
+DECLARE_COMPONENT( IOVDbTestAlg )
+DECLARE_COMPONENT( IOVDbTestCoolDCS )
 

Commission/CommissionRec/src/components/CommissionRec_entries.cxx

 #include "CommissionRec/ComTimeRec.h"
 
-DECLARE_ALGORITHM_FACTORY( ComTimeRec )
+DECLARE_COMPONENT( ComTimeRec )
 

Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx

 #include "CommissionUtils/CosmicTriggerTimeTool.h"
 
 
-DECLARE_TOOL_FACTORY( CosmicTriggerTimeTool ) 
+DECLARE_COMPONENT( CosmicTriggerTimeTool ) 
 

DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx

@@ -14,19 +14,19 @@
 #include "DataQualityTools/DQTGlobalWZFinderTool.h"
 #include "DataQualityTools/DQTLumiMonTool.h"
 
-DECLARE_TOOL_FACTORY(DataQualityFatherMonTool)
-//DECLARE_TOOL_FACTORY(DQTMuTrkEff)
-DECLARE_TOOL_FACTORY(DQTDetSynchMonTool)
-DECLARE_TOOL_FACTORY(DQTMuonIDTrackTool)
-//DECLARE_TOOL_FACTORY(DQTElectronQualityTool)
-//DECLARE_TOOL_FACTORY(DQTGlobalWFinderTool)
-//DECLARE_TOOL_FACTORY(DQTNonCollBkg_ZDC)
-DECLARE_TOOL_FACTORY(DQTBackgroundMon)
-//DECLARE_TOOL_FACTORY(DQTRateMonTool)
-//DECLARE_TOOL_FACTORY(DQTCaloClusterTool)
-DECLARE_TOOL_FACTORY(DQTDataFlowMonTool)
-//DECLARE_TOOL_FACTORY(DQTTopLeptonJetsFinderTool)
-//DECLARE_TOOL_FACTORY(DQTGlobalTopDilFinderTool)
-DECLARE_TOOL_FACTORY(DQTGlobalWZFinderTool)
-DECLARE_TOOL_FACTORY(DQTLumiMonTool)
+DECLARE_COMPONENT( DataQualityFatherMonTool )
+//DECLARE_COMPONENT( DQTMuTrkEff )
+DECLARE_COMPONENT( DQTDetSynchMonTool )
+DECLARE_COMPONENT( DQTMuonIDTrackTool )
+//DECLARE_COMPONENT( DQTElectronQualityTool )
+//DECLARE_COMPONENT( DQTGlobalWFinderTool )
+//DECLARE_COMPONENT( DQTNonCollBkg_ZDC )
+DECLARE_COMPONENT( DQTBackgroundMon )
+//DECLARE_COMPONENT( DQTRateMonTool )
+//DECLARE_COMPONENT( DQTCaloClusterTool )
+DECLARE_COMPONENT( DQTDataFlowMonTool )
+//DECLARE_COMPONENT( DQTTopLeptonJetsFinderTool )
+//DECLARE_COMPONENT( DQTGlobalTopDilFinderTool )
+DECLARE_COMPONENT( DQTGlobalWZFinderTool )
+DECLARE_COMPONENT( DQTLumiMonTool )
 

DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx

@@ -2,11 +2,11 @@
 #include "GoodRunsLists/TriggerRegistryTool.h"
 #include "GoodRunsLists/GoodRunsListSelectionTool.h"
 
-DECLARE_TOOL_FACTORY( GoodRunsListSelectorTool )
-DECLARE_TOOL_FACTORY( GoodRunsListSelectionTool )
-DECLARE_TOOL_FACTORY( TriggerRegistryTool )
+DECLARE_COMPONENT( GoodRunsListSelectorTool )
+DECLARE_COMPONENT( GoodRunsListSelectionTool )
+DECLARE_COMPONENT( TriggerRegistryTool )
 
 
 #include "../GRLSelectorAlg.h"
-DECLARE_ALGORITHM_FACTORY( GRLSelectorAlg )
+DECLARE_COMPONENT( GRLSelectorAlg )
 

DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx

@@ -3,8 +3,8 @@
 #include "GoodRunsListsUser/GoodRunsListSelectorAlg.h"
 #include "GoodRunsListsUser/GRLTriggerSelectorAlg.h"
 
-DECLARE_ALGORITHM_FACTORY( DummyDumperAlg )
-DECLARE_ALGORITHM_FACTORY( TriggerSelectorAlg )
-DECLARE_ALGORITHM_FACTORY( GoodRunsListSelectorAlg )
-DECLARE_ALGORITHM_FACTORY( GRLTriggerSelectorAlg )
+DECLARE_COMPONENT( DummyDumperAlg )
+DECLARE_COMPONENT( TriggerSelectorAlg )
+DECLARE_COMPONENT( GoodRunsListSelectorAlg )
+DECLARE_COMPONENT( GRLTriggerSelectorAlg )
 

Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h

@@ -157,7 +157,6 @@ public:
    /// Implementation of IIncidentListener: Handle for EndEvent incidence
    void handle(const Incident& incident);
 
-protected: // constructor and destructor
    /// Standard Service Constructor
    AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLocator);
    /// Destructor

Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx

@@ -4,9 +4,9 @@
 #include "../CondAttrListCollCnv.h"
 #include "../CondAttrListVecCnv.h"
 
-DECLARE_SERVICE_FACTORY(AthenaPoolCnvSvc)
-DECLARE_SERVICE_FACTORY(AthenaRootSerializeSvc)
-DECLARE_CONVERTER_FACTORY(AthenaAttributeListCnv)
-DECLARE_CONVERTER_FACTORY(CondAttrListCollCnv)
-DECLARE_CONVERTER_FACTORY(CondAttrListVecCnv)
+DECLARE_COMPONENT( AthenaPoolCnvSvc )
+DECLARE_COMPONENT( AthenaRootSerializeSvc )
+DECLARE_CONVERTER_FACTORY( AthenaAttributeListCnv )
+DECLARE_CONVERTER_FACTORY( CondAttrListCollCnv )
+DECLARE_CONVERTER_FACTORY( CondAttrListVecCnv )
 

Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx

@@ -9,14 +9,14 @@
 #include "../QueryTag.h"
 #include "../PassNoneFilter.h"
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReWriteData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadBs)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteCond)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadCond)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteTag)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, PassNoneFilter)
-DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, ReadMeta)
-DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, QueryTag)
+DECLARE_COMPONENT( AthPoolEx::WriteData )
+DECLARE_COMPONENT( AthPoolEx::ReWriteData )
+DECLARE_COMPONENT( AthPoolEx::ReadData )
+DECLARE_COMPONENT( AthPoolEx::ReadBs )
+DECLARE_COMPONENT( AthPoolEx::WriteCond )
+DECLARE_COMPONENT( AthPoolEx::ReadCond )
+DECLARE_COMPONENT( AthPoolEx::WriteTag )
+DECLARE_COMPONENT( AthPoolEx::PassNoneFilter )
+DECLARE_COMPONENT( AthPoolEx::ReadMeta )
+DECLARE_COMPONENT( AthPoolEx::QueryTag )
 

Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx

 #include "../AthenaRootStreamerSvc.h"
 
-DECLARE_SERVICE_FACTORY(AthenaRootStreamerSvc)
+DECLARE_COMPONENT( AthenaRootStreamerSvc )
 

Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx

@@ -2,7 +2,7 @@
 #include "../MetadataTest.h"
 #include "../RequireUniqueEvent.h"
 
-DECLARE_ALGORITHM_FACTORY(EventCount)
-DECLARE_ALGORITHM_FACTORY(MetadataTest)
-DECLARE_ALGORITHM_FACTORY(RequireUniqueEvent)
+DECLARE_COMPONENT( EventCount )
+DECLARE_COMPONENT( MetadataTest )
+DECLARE_COMPONENT( RequireUniqueEvent )
 

Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx

@@ -2,7 +2,7 @@
 #include "../EventSelectorAthenaPool.h"
 #include "../CondProxyProvider.h"
 
-DECLARE_SERVICE_FACTORY(AthenaPoolAddressProviderSvc)
-DECLARE_SERVICE_FACTORY(EventSelectorAthenaPool)
-DECLARE_SERVICE_FACTORY(CondProxyProvider)
+DECLARE_COMPONENT( AthenaPoolAddressProviderSvc )
+DECLARE_COMPONENT( EventSelectorAthenaPool )
+DECLARE_COMPONENT( CondProxyProvider )
 

Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx

@@ -5,10 +5,10 @@
 #include "../EventInfoAttListTool.h"
 #include "../EventInfoTagBuilder.h"
 
-DECLARE_TOOL_FACTORY(AthenaPoolOutputStreamTool)
-DECLARE_TOOL_FACTORY(MakeEventStreamInfo)
-DECLARE_TOOL_FACTORY(CopyEventStreamInfo)
-DECLARE_TOOL_FACTORY(EventInfoAttListTool)
-DECLARE_ALGORITHM_FACTORY(MakeInputDataHeader)
-DECLARE_ALGORITHM_FACTORY(EventInfoTagBuilder)
+DECLARE_COMPONENT( AthenaPoolOutputStreamTool )
+DECLARE_COMPONENT( MakeEventStreamInfo )
+DECLARE_COMPONENT( CopyEventStreamInfo )
+DECLARE_COMPONENT( EventInfoAttListTool )
+DECLARE_COMPONENT( MakeInputDataHeader )
+DECLARE_COMPONENT( EventInfoTagBuilder )
 

Database/AthenaPOOL/PoolSvc/src/PoolSvc.h

@@ -173,7 +173,6 @@ public: // Non-static members
    /// Setup Frontier cache for given logical or physical connection name
    StatusCode setFrontierCache(const std::string& conn) const;
 
-protected: // constructor and destructor
    /// Standard Service Constructor
    PoolSvc(const std::string& name, ISvcLocator* pSvcLocator);
    /// Destructor

Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx

 #include "../PoolSvc.h"
 
-DECLARE_SERVICE_FACTORY(PoolSvc)
+DECLARE_COMPONENT( PoolSvc )
 

Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h

@@ -120,8 +120,6 @@ class RDBAccessSvc final : public AthService, virtual public IRDBAccessSvc
   StatusCode finalize() override;
   StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
 
- protected:
-
   friend class SvcFactory<RDBAccessSvc>;
 
   /// Standard Service Constructor

Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx

 #include "../RDBAccessSvc.h"
 #include "../SourceCompAlg.h"
 
-DECLARE_SERVICE_FACTORY(RDBAccessSvc)
-DECLARE_ALGORITHM_FACTORY(SourceCompAlg)
+DECLARE_COMPONENT( RDBAccessSvc )
+DECLARE_COMPONENT( SourceCompAlg )