Merged parallel development (castor/job/stagerjob, castor/tape/tapegateway).

castor/db/CMakeLists.txt

@@ -23,3 +23,4 @@
 cmake_minimum_required (VERSION 2.6)
 
 add_subdirectory (cnv)
+add_subdirectory (ora)

castor/db/ora/CMakeLists.txt

+#
+#                      castor/db/ora/CMakeLists.txt
+#
+# This file is part of the Castor project.
+# See http://castor.web.cern.ch/castor
+#
+# Copyright (C) 2003  CERN
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# Steven.Murray@cern.ch
+#
+cmake_minimum_required (VERSION 2.6)
+
+################################################################################
+# Rules to build and install libcastorcommonora.so
+################################################################################
+set (COMMON_ORA_LIB_SRC_FILES
+  OraCnvSvc.cpp
+  OraStatement.cpp
+  OraResultSet.cpp
+  OraCommonSvc.cpp
+  OraRHSvc.cpp
+  OraStagerSvc.cpp
+  OraJobSvc.cpp
+  OraGCSvc.cpp
+  OraQuerySvc.cpp
+  SmartOcciResultSet.cpp
+  DLFInit.cpp)
+add_library (castorcommonora SHARED ${COMMON_ORA_LIB_SRC_FILES})
+set_target_properties (castorcommonora PROPERTIES
+  SOVERSION ${MAJOR_CASTOR_VERSION}
+  COMPILE_FLAGS ${ORACLE_CPPFLAGS})
+#target_link_libraries (castorcommonora castorclient)
+install (TARGETS castorcommonora DESTINATION ${CASTOR_DEST_LIB_DIR})
+CastorInstallConfigFile(ORASTAGER)
+
+################################################################################
+# Rules to build and install libcastorvdqmora
+################################################################################
+add_library (castorvdqmora OraVdqmSvc.cpp)
+set_target_properties (castorvdqmora PROPERTIES
+  COMPILE_FLAGS ${ORACLE_CPPFLAGS})
+install (TARGETS castorvdqmora DESTINATION ${CASTOR_DEST_LIB_DIR})
+CastorInstallConfigFile(ORAVDQM)

castor/tape/CMakeLists.txt

@@ -27,5 +27,6 @@ add_subdirectory (legacymsg)
 add_subdirectory (net)
 #add_subdirectory (rmc)
 add_subdirectory (tapebridge)
+add_subdirectory (tapegateway)
 add_subdirectory (tpcp)
 add_subdirectory (utils)

castor/tape/tapegateway/CMakeLists.txt

+#
+#                      castor/tape/tapegateway/CMakeLists.txt
+#
+# This file is part of the Castor project.
+# See http://castor.web.cern.ch/castor
+#
+# Copyright (C) 2003  CERN
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# Steven.Murray@cern.ch
+#
+cmake_minimum_required (VERSION 2.6)
+
+################################################################################
+# Rules to build and install tapegatewayd
+################################################################################
+set (TAPEGATEWAY_SRC_FILES
+  ScopedTransaction.cpp
+  TapeGatewayDlfMessageStrings.cpp
+  daemon/MountIdToFseqMap.cpp
+  daemon/NsTapeGatewayHelper.cpp
+  daemon/TapeGatewayDaemon.cpp
+  daemon/TapeGatewayMain.cpp
+  daemon/TapeMigrationMountLinkerThread.cpp 
+  daemon/VdqmRequestsCheckerThread.cpp 
+  daemon/VdqmRequestsProducerThread.cpp
+  daemon/VdqmTapeGatewayHelper.cpp 
+  daemon/VmgrTapeGatewayHelper.cpp 
+  daemon/WorkerThread.cpp
+  daemon/ora/OraTapeGatewaySvc.cpp
+)
+add_executable (tapegatewayd ${TAPEGATEWAY_SRC_FILES})
+set_target_properties (tapegatewayd PROPERTIES
+  COMPILE_FLAGS ${ORACLE_CPPFLAGS}
+  LINK_FLAGS "-L${ORACLE_LIBDIR} -locci -lclntsh")
+target_link_libraries (tapegatewayd castorclient castorcnv castorcommon
+  castorcommonora castorns castortapegatewayprotocol castortapenet
+  castortapeutils castorvdqm castorvmgr)
+install (TARGETS tapegatewayd DESTINATION ${CASTOR_DEST_BIN_DIR})
+CastorInstallAdmManPage (tapegatewayd)
+CastorInstallLogrotate (castor-tapegateway-server)
+CastorInstallSysconfig (tapegatewayd)
+CastorInstallInitScript (tapegatewayd)