From 941b87acbdb52e3ab62bc63a66d506a18628e7bc Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Tue, 28 Apr 2015 13:17:32 -0400 Subject: [PATCH 01/48] [#858] add IrodsSession session_collection_trash property --- tests/pydevtest/lib.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/pydevtest/lib.py b/tests/pydevtest/lib.py index d0565b2cbf..00d34073bd 100644 --- a/tests/pydevtest/lib.py +++ b/tests/pydevtest/lib.py @@ -426,13 +426,17 @@ def default_resource(self): def local_session_dir(self): return self._local_session_dir + @property + def home_collection(self): + return os.path.join('/', self.zone_name, 'home', self.username) + @property def session_collection(self): - return os.path.join('/', self.zone_name, 'home', self.username, self._session_id) + return os.path.join(self.home_collection, self._session_id) @property - def home_collection(self): - return os.path.join('/', self.zone_name, 'home', self.username) + def session_collection_trash(self): + return self.session_collection.replace('/home/', '/trash/home/', 1) def run_icommand(self, *args, **kwargs): self._prepare_run_icommand(args[0], kwargs) From c1a38f6cfef60444ddc125323bb006f591cb082c Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Tue, 28 Apr 2015 14:10:31 -0400 Subject: [PATCH 02/48] [#858] Refactor test_authentication_PAM_with_server_params --- tests/pydevtest/auth_suite.py | 49 ++++++++++++----------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/tests/pydevtest/auth_suite.py b/tests/pydevtest/auth_suite.py index ee23a0a255..8007ad8a63 100644 --- a/tests/pydevtest/auth_suite.py +++ b/tests/pydevtest/auth_suite.py @@ -133,45 +133,30 @@ def test_authentication_PAM_with_server_params(self): 'irods_client_server_policy': 'CS_NEG_REQUIRE', } - #session_env_backup = copy.deepcopy(self.admin.environment_file_contents) - #self.admin.environment_file_contents.update(client_update) - - # now the actual test auth_session_env_backup = copy.deepcopy(self.auth_session.environment_file_contents) self.auth_session.environment_file_contents.update(client_update) - # add server_config.json settings - serverConfigFile = lib.get_irods_config_dir() + "/server_config.json" - with open(serverConfigFile) as f: - contents = json.load(f) - os.system("cp %s %sOrig" % (serverConfigFile, serverConfigFile)) - contents['pam_password_length'] = 20 - contents['pam_no_extend'] = False - contents['pam_password_min_time'] = 121 - contents['pam_password_max_time'] = 1209600 - with open(serverConfigFile, 'w') as f: - json.dump(contents, f) - - # server reboot to pick up new irodsEnv and server settings - lib.restart_irods_server() + server_config_filename = lib.get_irods_config_dir() + '/server_config.json' + with lib.file_backed_up(server_config_filename): + server_config_update = { + 'pam_password_length': 20, + 'pam_no_extend': False, + 'pam_password_min_time': 121, + 'pam_password_max_time': 1209600, + } + lib.update_json_file_from_dict(server_config_filename, server_config_update) - # do the reauth - self.auth_session.assert_icommand(['iinit', self.auth_session.password]) - # connect and list some files - self.auth_session.assert_icommand("icd") - self.auth_session.assert_icommand("ils -L", 'STDOUT_SINGLELINE', "home") + lib.restart_irods_server() - # reset server_config.json to original - os.system('mv %sOrig %s' % (serverConfigFile, serverConfigFile)) + # the test + self.auth_session.assert_icommand(['iinit', self.auth_session.password]) + self.auth_session.assert_icommand("icd") + self.auth_session.assert_icommand("ils -L", 'STDOUT_SINGLELINE', "home") - # reset client environment to original - self.auth_session.environment_file_contents = auth_session_env_backup - - # clean up - for file in ['tests/pydevtest/server.key', 'tests/pydevtest/chain.pem', 'tests/pydevtest/dhparams.pem']: - os.unlink(os.path.join(lib.get_irods_top_level_dir(),file)) + self.auth_session.environment_file_contents = auth_session_env_backup + for file in ['tests/pydevtest/server.key', 'tests/pydevtest/chain.pem', 'tests/pydevtest/dhparams.pem']: + os.unlink(os.path.join(lib.get_irods_top_level_dir(),file)) - # server reboot to pick up new irodsEnv and server settings lib.restart_irods_server() def test_iinit_repaving_2646(self): From 33c716dcf20fd8e054e8686c2b0c4b9992e8fd77 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Thu, 23 Apr 2015 14:35:40 -0400 Subject: [PATCH 03/48] [#2064] Test for iput with --acl and --metadata --- tests/pydevtest/test_iput_options.py | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tests/pydevtest/test_iput_options.py diff --git a/tests/pydevtest/test_iput_options.py b/tests/pydevtest/test_iput_options.py new file mode 100644 index 0000000000..72e3fd4ff6 --- /dev/null +++ b/tests/pydevtest/test_iput_options.py @@ -0,0 +1,37 @@ +import os +import re +import sys + +if sys.version_info < (2, 7): + import unittest2 as unittest +else: + import unittest + +import configuration +from resource_suite import ResourceBase +import lib + + +class Test_iPut_Options(ResourceBase, unittest.TestCase): + def setUp(self): + super(Test_iPut_Options, self).setUp() + + def tearDown(self): + super(Test_iPut_Options, self).tearDown() + + def test_iput_options(self): + filepath = os.path.join( self.admin.local_session_dir, 'file' ) + lib.make_file( filepath, 1 ) + self.admin.assert_icommand('iput --metadata "a;v;u;a2;v2" --acl "' + self.user0.username + ' read;' + '" ' + filepath ) + #+ self.user1.username + ' write;" -- ' + filepath ) + self.admin.assert_icommand('ichmod read ' + self.user0.username + ' ' + self.admin.session_collection ) + self.admin.assert_icommand('ichmod read ' + self.user1.username + ' ' + self.admin.session_collection ) + self.admin.assert_icommand('imeta ls -d file', 'STDOUT', + '(attribute: *a2?\nvalue: *v2?\nunits: *u?(\n-+ *\n)?){2}', use_regex=True ) + self.admin.assert_icommand('ils -l', 'STDOUT') + self.admin.assert_icommand('iget -- ' + self.admin.session_collection + '/file ' + self.admin.local_session_dir + '/newfile' ) + self.user0.assert_icommand('iget -- ' + self.admin.session_collection + '/file ' + self.user0.local_session_dir + '/newfile' ) + new_filepath = os.path.join( self.user1.local_session_dir, 'file' ) + #skip the end until the iput -f of unowned files is resolved + #lib.make_file( new_filepath, 2 ) + #self.user1.assert_icommand('iput -f -- ' + new_filepath + ' ' + self.admin.session_collection + '/file' ); From 48eaf6791440eae8f6e34963a3604784b7ff327c Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 15:48:47 -0400 Subject: [PATCH 04/48] [#858] altered unpack behavior --- external/Makefile | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/external/Makefile b/external/Makefile index e7f7786c40..aa030c9607 100644 --- a/external/Makefile +++ b/external/Makefile @@ -9,7 +9,7 @@ MAKEFLAGS += --no-print-directory RENCI_FTP_EXTERNAL=ftp://ftp.renci.org/pub/irods/external RENCI_FTP_BUILD=ftp://ftp.renci.org/pub/irods/build -.PHONY : default build_database_for_macosx retrieve build generate clean cmake check libarchive jansson boost hdf5 netcdf epm lib_mysqludf_preg libs3 +.PHONY : default fetch build_database_for_macosx retrieve build generate clean cmake check libarchive jansson boost hdf5 netcdf epm lib_mysqludf_preg libs3 OSNAME=$$(../packaging/find_os.sh) OSVERSION=$$(../packaging/find_os_version.sh) @@ -45,7 +45,6 @@ ZEROMQVERSIONMAKE=$(ZEROMQVERSION)/Makefile CPPZMQVERSIONARCHIVE=$(CPPZMQVERSION).tar.gz CPPZMQVERSIONMAKE=$(CPPZMQVERSION)/Makefile -FAKETARGETFORMAKE=FakeTargetForMake LIBARCHIVESEDCMD="/^\#ifdef HAVE_LINUX_FIEMAP_H/i \#ifdef HAVE_LINUX_TYPES_H\x0a\#include \\x0a\#endif" @@ -54,10 +53,16 @@ PG_VERSION=9.3.4 UNIXODBC_VERSION=2.2.12 PGUNIXODBCARCHIVE=postgresql-$(PG_VERSION)_unixODBC-$(UNIXODBC_VERSION)-$(OSNAME).tar.gz -default : +default : fetch + +fetch : @echo "Getting $(IRODSEXTERNALARCHIVE) -> $(IRODSEXTERNALLOCAL)..." - @curl -o $(IRODSEXTERNALLOCAL) -z $(IRODSEXTERNALLOCAL) $(RENCI_FTP_BUILD)/$(IRODSEXTERNALARCHIVE) > /dev/null 2>&1 - @$(MAKE) $(FAKETARGETFORMAKE) + @filemtime=`stat -c %Y $(IRODSEXTERNALLOCAL) 2> /dev/null`; \ + curl -o $(IRODSEXTERNALLOCAL) -z $(IRODSEXTERNALLOCAL) $(RENCI_FTP_BUILD)/$(IRODSEXTERNALARCHIVE) > /dev/null 2>&1; \ + if [ "$$filemtime" != "`stat -c %Y $(IRODSEXTERNALLOCAL) 2> /dev/null`" ] ; then \ + echo "Unpacking $(IRODSEXTERNALLOCAL)..."; \ + tar zxf $(IRODSEXTERNALLOCAL); \ + fi $(PGUNIXODBCARCHIVE) : echo "Getting PostgreSQL and unixODBC source for MacOSX..."; \ @@ -80,11 +85,6 @@ build_database_for_macosx : postgresql-$(PG_VERSION)/Makefile cd ../../../../; \ $(MAKE) distclean; -$(FAKETARGETFORMAKE) : $(IRODSEXTERNALLOCAL) - @echo "Unpacking $(IRODSEXTERNALLOCAL)..." - @tar zxf $(IRODSEXTERNALLOCAL) - @touch $(FAKETARGETFORMAKE) - ifeq ($(OS_platform), osx_platform) build : cmake libarchive jansson boost epm hdf5 netcdf lib_mysqludf_preg libs3 check avro zeromq build_database_for_macosx else @@ -93,9 +93,8 @@ endif generate : build @echo "Building $(IRODSEXTERNALARCHIVE)..." - @tar zfc $(IRODSEXTERNALARCHIVE) --exclude "*.tar.gz" --exclude "*.zip" --exclude "*cmake*" --exclude "Makefile" --exclude $(FAKETARGETFORMAKE) * + @tar zfc $(IRODSEXTERNALARCHIVE) --exclude "*.tar.gz" --exclude "*.zip" --exclude "*cmake*" --exclude "Makefile" * @cp $(IRODSEXTERNALARCHIVE) $(IRODSEXTERNALLOCAL) - @touch $(FAKETARGETFORMAKE) $(LIB_MYSQLUDF_PREG_ARCHIVE) : @wget $(RENCI_FTP_EXTERNAL)/$(LIB_MYSQLUDF_PREG_ARCHIVE) 2>&1 @@ -321,4 +320,3 @@ clean : @echo "Cleaning $(IRODSEXTERNALARCHIVE)" @rm -f $(IRODSEXTERNALARCHIVE) @rm -f $(IRODSEXTERNALLOCAL) - @rm -f ${FAKETARGETFORMAKE} From 1a4968f3e789c90a37e081eca959ecd11f7406af Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:08:14 -0400 Subject: [PATCH 05/48] [#858] added future import --- packaging/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/build.sh b/packaging/build.sh index 71b51a5754..3bfc9cc2de 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -219,7 +219,7 @@ EPMCMD="external/epm/epm" cd $BUILDDIR/iRODS echo "Build Directory set to [$BUILDDIR]" # read iRODS Version from JSON -IRODSVERSION=`python -c "import json; d = json.loads(open('../VERSION.json.dist').read()); print d['irods_version']"` +IRODSVERSION=`python -c "from __future__ import print_function; import json; d = json.loads(open('../VERSION.json.dist').read()); print(d['irods_version'])"` echo "IRODSVERSION=$IRODSVERSION" > ../VERSION.tmp # needed for Makefiles IRODSVERSIONINT=${IRODSVERSION//\./0}0 echo "Detected iRODS Version to Build [$IRODSVERSION]" From d26a5a049595b30162b537803fbad462fe7fcafd Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:08:42 -0400 Subject: [PATCH 06/48] [#2064] reversed acl arguments to mirror ichmod --- iRODS/server/api/src/rsDataObjClose.cpp | 4 ++-- tests/pydevtest/test_iput_options.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iRODS/server/api/src/rsDataObjClose.cpp b/iRODS/server/api/src/rsDataObjClose.cpp index 0a9cc6fd7d..04ef6bd352 100644 --- a/iRODS/server/api/src/rsDataObjClose.cpp +++ b/iRODS/server/api/src/rsDataObjClose.cpp @@ -580,10 +580,10 @@ _rsDataObjClose( for ( std::vector >::const_iterator iter = deserialized_acl.begin(); iter != deserialized_acl.end(); ++iter ) { modAccessControlInp_t modAccessControlInp; modAccessControlInp.recursiveFlag = 0; - modAccessControlInp.accessLevel = strdup ( ( *iter )[1].c_str() ); + modAccessControlInp.accessLevel = strdup ( ( *iter )[0].c_str() ); modAccessControlInp.userName = ( char * )malloc( sizeof( char ) * NAME_LEN ); modAccessControlInp.zone = ( char * )malloc( sizeof( char ) * NAME_LEN ); - parseUserName( ( *iter )[0].c_str(), modAccessControlInp.userName, modAccessControlInp.zone ); + parseUserName( ( *iter )[1].c_str(), modAccessControlInp.userName, modAccessControlInp.zone ); modAccessControlInp.path = strdup( L1desc[l1descInx].dataObjInfo->objPath ); int status = rsModAccessControl( rsComm, &modAccessControlInp ); clearModAccessControlInp( &modAccessControlInp ); diff --git a/tests/pydevtest/test_iput_options.py b/tests/pydevtest/test_iput_options.py index 72e3fd4ff6..582a8d7115 100644 --- a/tests/pydevtest/test_iput_options.py +++ b/tests/pydevtest/test_iput_options.py @@ -22,8 +22,8 @@ def tearDown(self): def test_iput_options(self): filepath = os.path.join( self.admin.local_session_dir, 'file' ) lib.make_file( filepath, 1 ) - self.admin.assert_icommand('iput --metadata "a;v;u;a2;v2" --acl "' + self.user0.username + ' read;' + '" ' + filepath ) - #+ self.user1.username + ' write;" -- ' + filepath ) + self.admin.assert_icommand('iput --metadata "a;v;u;a2;v2" --acl "read ' + self.user0.username + ';" ' + filepath ) + #+ 'write ' + self.user1.username + ';" -- ' + filepath ) self.admin.assert_icommand('ichmod read ' + self.user0.username + ' ' + self.admin.session_collection ) self.admin.assert_icommand('ichmod read ' + self.user1.username + ' ' + self.admin.session_collection ) self.admin.assert_icommand('imeta ls -d file', 'STDOUT', From 351d7614706909d4af2c8ca8a361625c3a939025 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:13:32 -0400 Subject: [PATCH 07/48] [#2212] CID89505 and CID89506: closed destFd before it leaves scope --- .../mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp | 1 + .../mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp b/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp index 2b15a57f88..6637458331 100644 --- a/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp +++ b/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp @@ -214,6 +214,7 @@ extern "C" { single_buff_sz ); if( !ret.ok() ) { irods::log( PASS( ret ) ); + close( destFd ); return ret.code(); } single_buff_sz *= 1024 * 1024; diff --git a/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp b/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp index b047b1c670..b1f4a576a2 100644 --- a/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp +++ b/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp @@ -153,6 +153,7 @@ extern "C" { single_buff_sz ); if( !ret.ok() ) { irods::log( PASS( ret ) ); + close( destFd ); return ret.code(); } single_buff_sz *= 1024 * 1024; From 83884d67c172f66d641f5f0b88a4267c2f700f18 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:16:15 -0400 Subject: [PATCH 08/48] [#2212] CID89504 and CID37549: close inFd and outFd before they leave scope --- plugins/resources/nonblocking/libnonblocking.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/resources/nonblocking/libnonblocking.cpp b/plugins/resources/nonblocking/libnonblocking.cpp index 7c60ff4382..29dc1dd6a3 100644 --- a/plugins/resources/nonblocking/libnonblocking.cpp +++ b/plugins/resources/nonblocking/libnonblocking.cpp @@ -1171,7 +1171,9 @@ extern "C" { irods::CFG_TRANS_BUFFER_SIZE_FOR_PARA_TRANS, trans_buff_size ); if( !ret.ok() ) { - return PASS( ret ); + close( outFd ); + close( inFd ); + return PASS( ret ); } trans_buff_size *= 1024 * 1024; std::vector myBuf( trans_buff_size ); From 7db6bde6e7585326b3f267d8142db91b6b08a161 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:19:33 -0400 Subject: [PATCH 09/48] [#2212] CID85659: free srcDataObjInfo before it leaves scope --- iRODS/server/api/src/rsDataObjRepl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/iRODS/server/api/src/rsDataObjRepl.cpp b/iRODS/server/api/src/rsDataObjRepl.cpp index f035f859fc..49d30c765a 100644 --- a/iRODS/server/api/src/rsDataObjRepl.cpp +++ b/iRODS/server/api/src/rsDataObjRepl.cpp @@ -836,6 +836,7 @@ dataObjOpenForRepl( single_buff_sz ); if( !ret.ok() ) { irods::log( PASS( ret ) ); + freeDataObjInfo( srcDataObjInfo ); return ret.code(); } single_buff_sz *= 1024 * 1024; From 93c6e6276814f82cb3e3b88769daad0a250c1920 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:21:08 -0400 Subject: [PATCH 10/48] [#2212] CID83201 and CID37568: close inFd and outFd before they leave scope --- plugins/resources/unixfilesystem/libunixfilesystem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/resources/unixfilesystem/libunixfilesystem.cpp b/plugins/resources/unixfilesystem/libunixfilesystem.cpp index 4b2a80cc04..b7549d38d8 100644 --- a/plugins/resources/unixfilesystem/libunixfilesystem.cpp +++ b/plugins/resources/unixfilesystem/libunixfilesystem.cpp @@ -126,7 +126,9 @@ static irods::error unix_file_copy_plugin( irods::CFG_TRANS_BUFFER_SIZE_FOR_PARA_TRANS, trans_buff_size ); if( !ret.ok() ) { - return PASS( ret ); + close( inFd ); + close( outFd ); + return PASS( ret ); } trans_buff_size *= 1024 * 1024; From 10f746a7632c790163ad477c66cf2dd0764e857a Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:23:25 -0400 Subject: [PATCH 11/48] [#2212] CID43798: close srcFd before it leaves scope --- .../mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp b/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp index 466c529d57..9cc1cbef37 100644 --- a/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp +++ b/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp @@ -105,6 +105,7 @@ extern "C" { single_buff_sz_in_mb ); if( !ret.ok() ) { irods::log( PASS( ret ) ); + close( srcFd ); return ret.code(); } size_t single_buff_sz = single_buff_sz_in_mb * 1024 * 1024; From 377ad9c02710b9335988074e81eeaeb8de446a82 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:33:44 -0400 Subject: [PATCH 12/48] [#2212] CID89761: check return code of getRodsEnv --- iRODS/server/core/src/initServer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iRODS/server/core/src/initServer.cpp b/iRODS/server/core/src/initServer.cpp index 4301dcc743..a95e9c2145 100644 --- a/iRODS/server/core/src/initServer.cpp +++ b/iRODS/server/core/src/initServer.cpp @@ -1008,7 +1008,10 @@ int initRsComm( rsComm_t *rsComm ) { memset( rsComm, 0, sizeof( rsComm_t ) ); - getRodsEnv( &rsComm->myEnv ); + if ( int status = getRodsEnv( &rsComm->myEnv ) ) { + irods::log( ERROR( status, "getRodsEnv failed in initRsComm" ) ); + return status; + } irods::server_properties& props = irods::server_properties::getInstance(); irods::error ret = props.capture_if_needed(); From ca61150088873c428cec2953d0635d36a6ad89d5 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:46:09 -0400 Subject: [PATCH 13/48] [#2212] CID89761, CID89501, CID89500, CID89498, CID89497, CID89496, and CID89495 check return code of getRodsEnv --- iRODS/lib/core/src/rcPortalOpr.cpp | 44 +++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/iRODS/lib/core/src/rcPortalOpr.cpp b/iRODS/lib/core/src/rcPortalOpr.cpp index 3521c85097..1acd6e6a0c 100644 --- a/iRODS/lib/core/src/rcPortalOpr.cpp +++ b/iRODS/lib/core/src/rcPortalOpr.cpp @@ -90,9 +90,12 @@ fillBBufWithFile( rcComm_t *conn, bytesBuf_t *myBBuf, char *locFilePath, rodsLong_t dataSize ) { int in_fd, status; - rodsEnv env; - getRodsEnv( &env ); - int single_buff_sz = env.irodsMaxSizeForSingleBuffer * 1024 * 1024; + rodsEnv rods_env; + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } + int single_buff_sz = rods_env.irodsMaxSizeForSingleBuffer * 1024 * 1024; if ( dataSize > 10 * single_buff_sz ) { rodsLog( LOG_ERROR, @@ -547,9 +550,12 @@ putFile( rcComm_t *conn, int l1descInx, char *locFilePath, char *objPath, "cannot open file %s", locFilePath, status ); return status; } - + rodsEnv rods_env; - getRodsEnv( &rods_env ); + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } size_t trans_buff_sz = rods_env.irodsTransBufferSizeForParaTrans * 1024 * 1024; bzero( &dataObjWriteInp, sizeof( dataObjWriteInp ) ); @@ -709,9 +715,12 @@ getFile( rcComm_t *conn, int l1descInx, char *locFilePath, char *objPath, "cannot open file %s", locFilePath, status ); return status; } - + rodsEnv rods_env; - getRodsEnv( &rods_env ); + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } size_t trans_buff_sz = rods_env.irodsTransBufferSizeForParaTrans * 1024 * 1024; bzero( &dataObjReadInp, sizeof( dataObjReadInp ) ); @@ -1566,9 +1575,12 @@ lfRestartPutWithInfo( rcComm_t *conn, fileRestartInfo_t *info ) { close( localFd ); return irodsFd; } - + rodsEnv rods_env; - getRodsEnv( &rods_env ); + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } size_t trans_buff_sz = rods_env.irodsTransBufferSizeForParaTrans * 1024 * 1024; bzero( &dataObjWriteInp, sizeof( dataObjWriteInp ) ); @@ -1728,9 +1740,12 @@ lfRestartGetWithInfo( rcComm_t *conn, fileRestartInfo_t *info ) { close( localFd ); return irodsFd; } - + rodsEnv rods_env; - getRodsEnv( &rods_env ); + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } size_t trans_buff_sz = rods_env.irodsTransBufferSizeForParaTrans * 1024 * 1024; bzero( &dataObjReadInp, sizeof( dataObjReadInp ) ); @@ -1885,9 +1900,12 @@ catDataObj( rcComm_t *conn, char *objPath ) { "catDataObj: rcDataObjOpen error for %s", objPath ); return l1descInx; } - + rodsEnv rods_env; - getRodsEnv( &rods_env ); + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } size_t trans_buff_sz = rods_env.irodsTransBufferSizeForParaTrans * 1024 * 1024; bzero( &dataObjReadInp, sizeof( dataObjReadInp ) ); dataObjReadOutBBuf.buf = malloc( trans_buff_sz + 1 ); From 0c4942a74a44e0002bbe0759dfe9f1b0aa9e4833 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Tue, 28 Apr 2015 16:49:20 -0400 Subject: [PATCH 14/48] [#2212] CID89499: check return code of getRodsEnv --- iRODS/lib/api/src/rcDataObjPut.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/iRODS/lib/api/src/rcDataObjPut.cpp b/iRODS/lib/api/src/rcDataObjPut.cpp index 5861897476..7a187feec1 100644 --- a/iRODS/lib/api/src/rcDataObjPut.cpp +++ b/iRODS/lib/api/src/rcDataObjPut.cpp @@ -109,9 +109,12 @@ rcDataObjPut( rcComm_t *conn, dataObjInp_t *dataObjInp, char *locFilePath ) { memset( &conn->transStat, 0, sizeof( transStat_t ) ); memset( &dataObjInpBBuf, 0, sizeof( dataObjInpBBuf ) ); - rodsEnv env; - getRodsEnv( &env ); - int single_buff_sz = env.irodsMaxSizeForSingleBuffer * 1024 * 1024; + rodsEnv rods_env; + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } + int single_buff_sz = rods_env.irodsMaxSizeForSingleBuffer * 1024 * 1024; if ( getValByKey( &dataObjInp->condInput, DATA_INCLUDED_KW ) != NULL ) { if ( dataObjInp->dataSize > single_buff_sz ) { rmKeyVal( &dataObjInp->condInput, DATA_INCLUDED_KW ); @@ -202,9 +205,12 @@ rcDataObjPut( rcComm_t *conn, dataObjInp_t *dataObjInp, char *locFilePath ) { portalOprOut->portList.portNum, portalOprOut->portList.cookie ); } /* some sanity check */ - rodsEnv env; - getRodsEnv( &env ); - if ( portalOprOut->numThreads >= 20 * env.irodsDefaultNumberTransferThreads ) { + rodsEnv rods_env; + if ( int status = getRodsEnv( &rods_env ) ) { + rodsLog( LOG_ERROR, "getRodsEnv failed in %s with status %s", __FUNCTION__, status ); + return status; + } + if ( portalOprOut->numThreads >= 20 * rods_env.irodsDefaultNumberTransferThreads ) { rcOprComplete( conn, SYS_INVALID_PORTAL_OPR ); free( portalOprOut ); return SYS_INVALID_PORTAL_OPR; From 727eb656ca951d3b2fe34b9d0d707d1288f853a2 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Tue, 28 Apr 2015 22:42:39 -0400 Subject: [PATCH 15/48] [#2664] configurable schema location support --- iRODS/scripts/perl/irodsctl.pl | 56 +++++++++++-------- iRODS/scripts/perl/utils_config.pl | 15 ++++- packaging/server_config.json.template | 3 +- packaging/setup_irods_configuration.sh | 44 +++++++++++---- packaging/update_configuration_schema.py | 5 +- .../packaging/localhost_setup_mysql.input | 1 + .../packaging/localhost_setup_postgres.input | 1 + .../setup_irods_database.sh.template | 3 + .../packaging/setup_oracle_centos5.input | 1 + .../packaging/setup_oracle_centos6.input | 1 + .../packaging/setup_oracle_suse11.input | 1 + .../packaging/setup_oracle_suse12.input | 1 + .../packaging/setup_oracle_ub10.input | 1 + .../packaging/setup_oracle_ub12.input | 1 + 14 files changed, 97 insertions(+), 37 deletions(-) diff --git a/iRODS/scripts/perl/irodsctl.pl b/iRODS/scripts/perl/irodsctl.pl index 31639c76d4..e3c9affb7a 100644 --- a/iRODS/scripts/perl/irodsctl.pl +++ b/iRODS/scripts/perl/irodsctl.pl @@ -132,6 +132,9 @@ } } +# load version information +load_irods_version_file("$scripttoplevel/VERSION.json"); + ######################################################################## # @@ -178,24 +181,24 @@ # using this script. # -$ENV{'irodsHomeDir'} = $IRODS_HOME; +$ENV{'irodsHomeDir'} = $IRODS_HOME; $ENV{'irodsConfigDir'} = $irodsServerConfigDir; -if ($irodsEnvFile) { $ENV{'IRODS_ENVIRNOMENT_FILE'} = $irodsEnvFile; } -if ($irodsPort) { $ENV{'IRODS_PORT'} = $irodsPort; } -if ($spLogLevel) { $ENV{'spLogLevel'} = $spLogLevel; } -if ($spLogSql) { $ENV{'spLogSql'} = $spLogSql; } -if ($SVR_PORT_RANGE_START) { $ENV{'svrPortRangeStart'} = $SVR_PORT_RANGE_START; } -if ($SVR_PORT_RANGE_END) { $ENV{'svrPortRangeEnd'} = $SVR_PORT_RANGE_END; } -if ($svrPortRangeStart) { $ENV{'svrPortRangeStart'} = $svrPortRangeStart; } -if ($svrPortRangeEnd) { $ENV{'svrPortRangeEnd'} = $svrPortRangeEnd; } -if ($reServerOption) { $ENV{'reServerOption'} = $reServerOption; } -if ($irodsReconnect) { $ENV{'irodsReconnect'} = $irodsReconnect; } -if ($RETESTFLAG) { $ENV{'RETESTFLAG'} = $RETESTFLAG; } -if ($GLOBALALLRULEEXECFLAG) { $ENV{'GLOBALALLRULEEXECFLAG'} = $GLOBALALLRULEEXECFLAG; } -if ($PREPOSTPROCFORGENQUERYFLAG) { $ENV{'PREPOSTPROCFORGENQUERYFLAG'} = $PREPOSTPROCFORGENQUERYFLAG; } -if ($GLOBALREAUDITFLAG) { $ENV{'GLOBALREAUDITFLAG'} = $GLOBALREAUDITFLAG; } -if ($GLOBALREDEBUGFLAG) { $ENV{'GLOBALREDEBUGFLAG'} = $GLOBALREDEBUGFLAG; } -if ($LOGFILE_INT) { $ENV{'logfileInt'} = $LOGFILE_INT; } +if ($irodsEnvFile) { $ENV{'IRODS_ENVIRNOMENT_FILE'} = $irodsEnvFile; } +if ($irodsPort) { $ENV{'IRODS_PORT'} = $irodsPort; } +if ($spLogLevel) { $ENV{'spLogLevel'} = $spLogLevel; } +if ($spLogSql) { $ENV{'spLogSql'} = $spLogSql; } +if ($SVR_PORT_RANGE_START) { $ENV{'svrPortRangeStart'} = $SVR_PORT_RANGE_START; } +if ($SVR_PORT_RANGE_END) { $ENV{'svrPortRangeEnd'} = $SVR_PORT_RANGE_END; } +if ($svrPortRangeStart) { $ENV{'svrPortRangeStart'} = $svrPortRangeStart; } +if ($svrPortRangeEnd) { $ENV{'svrPortRangeEnd'} = $svrPortRangeEnd; } +if ($reServerOption) { $ENV{'reServerOption'} = $reServerOption; } +if ($irodsReconnect) { $ENV{'irodsReconnect'} = $irodsReconnect; } +if ($RETESTFLAG) { $ENV{'RETESTFLAG'} = $RETESTFLAG; } +if ($GLOBALALLRULEEXECFLAG) { $ENV{'GLOBALALLRULEEXECFLAG'} = $GLOBALALLRULEEXECFLAG; } +if ($PREPOSTPROCFORGENQUERYFLAG) { $ENV{'PREPOSTPROCFORGENQUERYFLAG'} = $PREPOSTPROCFORGENQUERYFLAG; } +if ($GLOBALREAUDITFLAG) { $ENV{'GLOBALREAUDITFLAG'} = $GLOBALREAUDITFLAG; } +if ($GLOBALREDEBUGFLAG) { $ENV{'GLOBALREDEBUGFLAG'} = $GLOBALREDEBUGFLAG; } +if ($LOGFILE_INT) { $ENV{'logfileInt'} = $LOGFILE_INT; } @@ -947,7 +950,7 @@ sub preflight_check { # local variables my $VALIDATE = "python $scripttoplevel/iRODS/scripts/python/validate_json.py"; - my $SCHEMA_ROOT_URL = "https://schemas.irods.org/configuration/v2"; + my $SCHEMA_ROOT_URL = "$SCHEMA_VALIDATION_BASE_URI/v$CONFIGURATION_SCHEMA_VERSION"; my $retval; my $HOME_DIR = $ENV{'HOME'}; @@ -1002,11 +1005,20 @@ sub startIrods printError( " is not writable. Please chmod it and retry.\n" ); exit( 1 ); } - if ( 0 == preflight_check( ) ) + + # Make sure the configurations are validated + if ( $SCHEMA_VALIDATION_BASE_URI =~ /^https?:\/\// ) { - printError( "Preflight Check problem:\n" ); - printError( " JSON Configuration Validation failed.\n" ); - exit( 1 ); + if ( 0 == preflight_check( ) ) + { + printError( "Preflight Check problem:\n" ); + printError( " JSON Configuration Validation failed.\n" ); + exit( 1 ); + } + } + else + { + printStatus( "Skipped JSON Configuration Validation [$SCHEMA_VALIDATION_BASE_URI]\n" ); } # Test for iRODS port in use diff --git a/iRODS/scripts/perl/utils_config.pl b/iRODS/scripts/perl/utils_config.pl index b7e43319f5..7f3c06581d 100644 --- a/iRODS/scripts/perl/utils_config.pl +++ b/iRODS/scripts/perl/utils_config.pl @@ -62,6 +62,7 @@ sub load_server_config { $RESOURCE_DIR = undef; $IRODS_ADMIN_PASSWORD = undef; $IRODS_ICAT_HOST = undef; + $SCHEMA_VALIDATION_BASE_URI = undef; # load specific variables $data = load_json_file($filename); $IRODS_ADMIN_NAME = $data->{'zone_user'}; @@ -74,6 +75,7 @@ sub load_server_config { $RESOURCE_DIR = $data->{'default_resource_directory'}; $IRODS_ADMIN_PASSWORD = $data->{'admin_password'}; $IRODS_ICAT_HOST = $data->{'icat_host'}; + $SCHEMA_VALIDATION_BASE_URI = $data->{'schema_validation_base_uri'}; # return return 1; } @@ -85,7 +87,7 @@ sub load_database_config { $DATABASE_ODBC_TYPE = undef; $DATABASE_HOST = undef; $DATABASE_PORT = undef; - $DB_NAME = undef; + $DB_NAME = undef; $DATABASE_ADMIN_NAME = undef; $DATABASE_ADMIN_PASSWORD = undef; # load specific variables @@ -101,4 +103,15 @@ sub load_database_config { return 1; } +sub load_irods_version_file { + my ($filename) = @_; + # from VERSION.json + $CONFIGURATION_SCHEMA_VERSION = undef; + # load specific variables + $data = load_json_file($filename); + $CONFIGURATION_SCHEMA_VERSION = $data->{'configuration_schema_version'}; + # return + return 1; +} + return( 1 ); diff --git a/packaging/server_config.json.template b/packaging/server_config.json.template index b8329339eb..0bce576195 100644 --- a/packaging/server_config.json.template +++ b/packaging/server_config.json.template @@ -38,6 +38,7 @@ "zone_name": "tempZone", "zone_port": 1247, "zone_user": "rods", + "schema_validation_base_uri": "https://schemas.irods.org/configuration", "advanced_settings" : { "maximum_size_for_single_buffer_in_megabytes" : 32, "default_number_of_transfer_threads" : 4, @@ -45,6 +46,6 @@ "transfer_buffer_size_for_parallel_transfer_in_megabytes" : 4, "default_temporary_password_lifetime_in_seconds" : 120, "maximum_temporary_password_lifetime_in_seconds" : 1000, - "maximum_number_of_concurrent_rule_engine_server_processes" : 4 + "maximum_number_of_concurrent_rule_engine_server_processes" : 4 } } diff --git a/packaging/setup_irods_configuration.sh b/packaging/setup_irods_configuration.sh index e1b48fe9ac..77d552f721 100644 --- a/packaging/setup_irods_configuration.sh +++ b/packaging/setup_irods_configuration.sh @@ -74,6 +74,7 @@ fi MYNEGOTIATIONKEY=`$PYTHON -c "import json; print json.load(open('$MYSERVERCONFIGJSON'))['negotiation_key']"` MYCONTROLPLANEPORT=`$PYTHON -c "import json; print json.load(open('$MYSERVERCONFIGJSON'))['server_control_plane_port']"` MYCONTROLPLANEKEY=`$PYTHON -c "import json; print json.load(open('$MYSERVERCONFIGJSON'))['server_control_plane_key']"` + MYVALIDATIONBASEURI=`$PYTHON -c "import json; print json.load(open('$MYSERVERCONFIGJSON'))['schema_validation_base_uri']"` MYADMINNAME=`$PYTHON -c "import json; print json.load(open('$MYSERVERCONFIGJSON'))['zone_user']"` STATUS="loop" else @@ -117,6 +118,9 @@ fi LASTMYADMINNAME=$MYADMINNAME LASTMYLOCALZONEKEY=$MYLOCALZONEKEY LASTMYNEGOTIATIONKEY=$MYNEGOTIATIONKEY + LASTMYCONTROLPLANEPORT=$MYCONTROLPLANEPORT + LASTMYCONTROLPLANEKEY=$MYCONTROLPLANEKEY + LASTMYVALIDATIONBASEURI=$MYVALIDATIONBASEURI fi if [ $ICAT_SERVER -eq 1 ] ; then @@ -323,6 +327,24 @@ fi fi done + # get schema validation base uri + echo -n "Schema Validation Base URI (or 'off')" + if [ "$LASTMYVALIDATIONBASEURI" ] ; then + echo -n " [$LASTMYVALIDATIONBASEURI]" + else + echo -n " [https://schemas.irods.org/configuration]" + fi + echo -n ": " + read MYVALIDATIONBASEURI + if [ "$MYVALIDATIONBASEURI" == "" ] ; then + if [ "$LASTMYVALIDATIONBASEURI" ] ; then + MYVALIDATIONBASEURI=$LASTMYVALIDATIONBASEURI + else + MYVALIDATIONBASEURI="https://schemas.irods.org/configuration" + fi + fi + echo "" + # get admin name echo -n "iRODS server's administrator username" if [ "$LASTMYADMINNAME" ] ; then @@ -365,17 +387,18 @@ fi # confirm echo "-------------------------------------------" if [ $ICAT_SERVER -eq 1 ] ; then - echo "iRODS Zone: $MYZONE" + echo "iRODS Zone: $MYZONE" fi - echo "iRODS Port: $MYPORT" - echo "Range (Begin): $MYRANGESTART" - echo "Range (End): $MYRANGEEND" - echo "Vault Directory: $MYRESOURCEDIR" - echo "zone_key: $MYLOCALZONEKEY" - echo "negotiation_key: $MYNEGOTIATIONKEY" - echo "Control Plane Port: $MYCONTROLPLANEPORT" - echo "Control Plane Key: $MYCONTROLPLANEKEY" - echo "Administrator Username: $MYADMINNAME" + echo "iRODS Port: $MYPORT" + echo "Range (Begin): $MYRANGESTART" + echo "Range (End): $MYRANGEEND" + echo "Vault Directory: $MYRESOURCEDIR" + echo "zone_key: $MYLOCALZONEKEY" + echo "negotiation_key: $MYNEGOTIATIONKEY" + echo "Control Plane Port: $MYCONTROLPLANEPORT" + echo "Control Plane Key: $MYCONTROLPLANEKEY" + echo "Schema Validation Base URI: $MYVALIDATIONBASEURI" + echo "Administrator Username: $MYADMINNAME" if [ $ICAT_SERVER -eq 1 ] ; then echo "Administrator Password: Not Shown" fi @@ -409,6 +432,7 @@ fi $PYTHON $DETECTEDDIR/update_json.py $MYSERVERCONFIGJSON string negotiation_key $MYNEGOTIATIONKEY $PYTHON $DETECTEDDIR/update_json.py $MYSERVERCONFIGJSON integer server_control_plane_port $MYCONTROLPLANEPORT $PYTHON $DETECTEDDIR/update_json.py $MYSERVERCONFIGJSON string server_control_plane_key $MYCONTROLPLANEKEY + $PYTHON $DETECTEDDIR/update_json.py $MYSERVERCONFIGJSON string schema_validation_base_uri $MYVALIDATIONBASEURI $PYTHON $DETECTEDDIR/update_json.py $MYSERVERCONFIGJSON string icat_host `hostname` if [ $ICAT_SERVER -eq 1 ] ; then $PYTHON $DETECTEDDIR/update_json.py $MYSERVERCONFIGJSON string admin_password $MYADMINPASSWORD diff --git a/packaging/update_configuration_schema.py b/packaging/update_configuration_schema.py index 17de0b7d78..c0853c93f7 100644 --- a/packaging/update_configuration_schema.py +++ b/packaging/update_configuration_schema.py @@ -47,7 +47,7 @@ def get_target_schema_version(): def update_configuration_files(version): print('Updating to Configuration Schema... %d' % version) # manipulate the configuration files - print_debug('ALTERING (but not really) THE CONFIGURATION STUFF') + print_debug('PLACEHOLDER') # success print_debug('SUCCESS, updated configuration_schema_version to %d' % version) @@ -63,8 +63,7 @@ def update_configuration_to_latest_version(): current_schema_version, target_schema_version)) return if current_schema_version == target_schema_version: - print('Configuration Schema Version is already up to date (version=%d).' % - target_schema_version) + print('Configuration Schema Version is already up to date (version=%d).' % target_schema_version) return # surgically alter existing version with any new information, with defaults update_configuration_files(target_schema_version) diff --git a/plugins/database/packaging/localhost_setup_mysql.input b/plugins/database/packaging/localhost_setup_mysql.input index c5e64e12b4..ee10762540 100644 --- a/plugins/database/packaging/localhost_setup_mysql.input +++ b/plugins/database/packaging/localhost_setup_mysql.input @@ -10,6 +10,7 @@ + rods localhost diff --git a/plugins/database/packaging/localhost_setup_postgres.input b/plugins/database/packaging/localhost_setup_postgres.input index c5e64e12b4..ee10762540 100644 --- a/plugins/database/packaging/localhost_setup_postgres.input +++ b/plugins/database/packaging/localhost_setup_postgres.input @@ -10,6 +10,7 @@ + rods localhost diff --git a/plugins/database/packaging/setup_irods_database.sh.template b/plugins/database/packaging/setup_irods_database.sh.template index 07c505653c..35d1b73751 100755 --- a/plugins/database/packaging/setup_irods_database.sh.template +++ b/plugins/database/packaging/setup_irods_database.sh.template @@ -290,6 +290,9 @@ MYSETUPVALUESSQL=`find $TOPLEVELDIR -name icatSetupValues.sql` rm -f $MYSETUPVALUESSQL # server config $PYTHON $DETECTEDDIR/update_json.py $server_config string admin_password XXXXXXXXXX +TMPFILE=`mktemp -t irods_tmp_server_config.XXXXXX` +sed -e '/admin_password/d' $server_config > $TMPFILE +mv $TMPFILE $server_config # =-=-=-=-=-=-=- # run update_catalog_schema.py diff --git a/plugins/database/packaging/setup_oracle_centos5.input b/plugins/database/packaging/setup_oracle_centos5.input index dc151cc325..aa81bb6544 100644 --- a/plugins/database/packaging/setup_oracle_centos5.input +++ b/plugins/database/packaging/setup_oracle_centos5.input @@ -10,6 +10,7 @@ + rods diff --git a/plugins/database/packaging/setup_oracle_centos6.input b/plugins/database/packaging/setup_oracle_centos6.input index 53ef1e2b41..c882456e40 100644 --- a/plugins/database/packaging/setup_oracle_centos6.input +++ b/plugins/database/packaging/setup_oracle_centos6.input @@ -10,6 +10,7 @@ + rods diff --git a/plugins/database/packaging/setup_oracle_suse11.input b/plugins/database/packaging/setup_oracle_suse11.input index e40ce57a02..92dd61b7d7 100644 --- a/plugins/database/packaging/setup_oracle_suse11.input +++ b/plugins/database/packaging/setup_oracle_suse11.input @@ -10,6 +10,7 @@ + rods diff --git a/plugins/database/packaging/setup_oracle_suse12.input b/plugins/database/packaging/setup_oracle_suse12.input index 2b248e43b8..908b051a49 100644 --- a/plugins/database/packaging/setup_oracle_suse12.input +++ b/plugins/database/packaging/setup_oracle_suse12.input @@ -10,6 +10,7 @@ + rods diff --git a/plugins/database/packaging/setup_oracle_ub10.input b/plugins/database/packaging/setup_oracle_ub10.input index a732185656..f1810bc894 100644 --- a/plugins/database/packaging/setup_oracle_ub10.input +++ b/plugins/database/packaging/setup_oracle_ub10.input @@ -10,6 +10,7 @@ + rods diff --git a/plugins/database/packaging/setup_oracle_ub12.input b/plugins/database/packaging/setup_oracle_ub12.input index a732185656..f1810bc894 100644 --- a/plugins/database/packaging/setup_oracle_ub12.input +++ b/plugins/database/packaging/setup_oracle_ub12.input @@ -10,6 +10,7 @@ + rods From ab4021524de7fbbd861638b9e580ec7ea1c4408c Mon Sep 17 00:00:00 2001 From: Jason Coposky Date: Wed, 29 Apr 2015 09:30:33 -0400 Subject: [PATCH 16/48] [#2667] filter out all incorrect replicas --- iRODS/server/api/src/rsStructFileBundle.cpp | 57 +++++++++++++-------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/iRODS/server/api/src/rsStructFileBundle.cpp b/iRODS/server/api/src/rsStructFileBundle.cpp index 2f9ffc6521..42000b9c11 100644 --- a/iRODS/server/api/src/rsStructFileBundle.cpp +++ b/iRODS/server/api/src/rsStructFileBundle.cpp @@ -239,14 +239,27 @@ int _rsStructFileBundle( rsComm_t* rsComm, // preserve the collection path? collEnt_t* collEnt = NULL; while ( ( status = rsReadCollection( rsComm, &handleInx, &collEnt ) ) >= 0 ) { - if ( NULL == collEnt ) { // JMC cppcheck - nullptr - rodsLog( LOG_ERROR, "rsStructFileBundle: collEnt is NULL" ); + if ( NULL == collEnt ) { + rodsLog( + LOG_ERROR, + "rsStructFileBundle: collEnt is NULL" ); continue; } // =-=-=-=-=-=-=- // entry is a data object if ( collEnt->objType == DATA_OBJ_T ) { + // =-=-=-=-=-=-=- + // filter out any possible replicas that are not on this resource + if ( resc_hier != collEnt->resc_hier ) { + rodsLog( + LOG_DEBUG, + "_rsStructFileBundle - skipping [%s] on resc [%s]", + collEnt->phyPath, + collEnt->resc_hier ); + continue; + } + if ( collEnt->collName[collLen] == '\0' ) { snprintf( tmpPath, @@ -269,32 +282,36 @@ int _rsStructFileBundle( rsComm_t* rsComm, collEnt->resc_hier, getDefDirMode() ); if ( status < 0 ) { - rodsLog( LOG_ERROR, "mkDirForFilePath failed in _rsStructFileBundle with status %d", status ); + rodsLog( + LOG_ERROR, + "mkDirForFilePath failed in _rsStructFileBundle with status %d", + status ); free( collEnt ); return status; } } // =-=-=-=-=-=-=- - // filter out any possible replicas that are not on this resource - if ( resc_hier == collEnt->resc_hier ) { - // =-=-=-=-=-=-=- - // add a link - status = link( collEnt->phyPath, tmpPath ); - if ( status < 0 ) { - rodsLog( LOG_ERROR, "rsStructFileBundle: link error %s to %s. errno = %d", - collEnt->phyPath, tmpPath, errno ); - rmLinkedFilesInUnixDir( phyBunDir ); - rmdir( phyBunDir ); - free( collEnt ); - return UNIX_FILE_LINK_ERR - errno; - } - else { - //rodsLog( LOG_NOTICE, "_rsStructFileBundle - LINK [%s] on resc [%s]", collEnt->phyPath, collEnt->resc_hier ); - } + // add a link + status = link( collEnt->phyPath, tmpPath ); + if ( status < 0 ) { + rodsLog( + LOG_ERROR, + "rsStructFileBundle: link error %s to %s. errno = %d", + collEnt->phyPath, + tmpPath, + errno ); + rmLinkedFilesInUnixDir( phyBunDir ); + rmdir( phyBunDir ); + free( collEnt ); + return UNIX_FILE_LINK_ERR - errno; } else { - //rodsLog( LOG_NOTICE, "_rsStructFileBundle - skipping [%s] on resc [%s]", collEnt->phyPath, collEnt->resc_hier ); + rodsLog( + LOG_DEBUG, + "_rsStructFileBundle - LINK [%s] on resc [%s]", + collEnt->phyPath, + collEnt->resc_hier ); } } else { From 161c8573ce6e406bf75cd28b1ce3624635439c1e Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 09:41:40 -0400 Subject: [PATCH 17/48] [#858] remove cruft --- packaging/postinstall.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packaging/postinstall.sh b/packaging/postinstall.sh index 94c72ec6ab..0902be14c8 100755 --- a/packaging/postinstall.sh +++ b/packaging/postinstall.sh @@ -71,15 +71,6 @@ fi # =-=-=-=-=-=-=- # symlink the icommands - -#ln -s /usr/bin/chgCoreToCore1.ir ${IRODS_HOME}/clients/icommands/bin/chgCoreToCore1.ir -#ln -s /usr/bin/chgCoreToCore2.ir ${IRODS_HOME}/clients/icommands/bin/chgCoreToCore2.ir -#ln -s /usr/bin/chgCoreToOrig.ir ${IRODS_HOME}/clients/icommands/bin/chgCoreToOrig.ir -#ln -s /usr/bin/delUnusedAVUs.ir ${IRODS_HOME}/clients/icommands/bin/delUnusedAVUs.ir -#ln -s /usr/bin/runQuota.ir ${IRODS_HOME}/clients/icommands/bin/runQuota.ir -#ln -s /usr/bin/runQuota.r ${IRODS_HOME}/clients/icommands/bin/runQuota.r -#ln -s /usr/bin/showCore.ir ${IRODS_HOME}/clients/icommands/bin/showCore.ir - ln -fs /usr/bin/genOSAuth ${IRODS_HOME}/clients/icommands/bin/genOSAuth ln -fs /usr/bin/iadmin ${IRODS_HOME}/clients/icommands/bin/iadmin ln -fs /usr/bin/ibun ${IRODS_HOME}/clients/icommands/bin/ibun From 80aa0b6936644a075458971b2619e29c5a9add1c Mon Sep 17 00:00:00 2001 From: John Marshall Date: Tue, 28 Apr 2015 10:00:57 +0100 Subject: [PATCH 18/48] [#2666] Add --verbose option for less quiet builds Running build.sh --verbose or make VERBOSE=1 removes the @ from significant compilation commands in the makefiles and so displays the commands during builds. In some debugging situations it is useful to see the exact flags used, and this is the most direct way to see them. --- external/Makefile | 12 ++--- iRODS/clients/c_api_test/Makefile | 2 +- iRODS/clients/fuse/Makefile | 6 +-- iRODS/clients/icommands/Makefile | 4 +- iRODS/clients/icommands/rulegen/Makefile | 4 +- iRODS/config/config.mk.in | 10 ++++ iRODS/lib/Makefile | 12 ++--- iRODS/server/Makefile | 49 ++++++++++--------- packaging/build.sh | 17 ++++++- plugins/Makefile.base | 8 +-- plugins/auth/Makefile.base | 4 +- plugins/database/Makefile.base | 12 ++--- .../microservices/mso_drivers/Makefile.base | 6 +-- plugins/network/Makefile.base | 4 +- plugins/resources/Makefile.base | 4 +- 15 files changed, 89 insertions(+), 65 deletions(-) diff --git a/external/Makefile b/external/Makefile index aa030c9607..d5e190b943 100644 --- a/external/Makefile +++ b/external/Makefile @@ -58,15 +58,15 @@ default : fetch fetch : @echo "Getting $(IRODSEXTERNALARCHIVE) -> $(IRODSEXTERNALLOCAL)..." @filemtime=`stat -c %Y $(IRODSEXTERNALLOCAL) 2> /dev/null`; \ - curl -o $(IRODSEXTERNALLOCAL) -z $(IRODSEXTERNALLOCAL) $(RENCI_FTP_BUILD)/$(IRODSEXTERNALARCHIVE) > /dev/null 2>&1; \ + $(V_at)curl -o $(IRODSEXTERNALLOCAL) -z $(IRODSEXTERNALLOCAL) $(RENCI_FTP_BUILD)/$(IRODSEXTERNALARCHIVE) > /dev/null 2>&1; \ if [ "$$filemtime" != "`stat -c %Y $(IRODSEXTERNALLOCAL) 2> /dev/null`" ] ; then \ - echo "Unpacking $(IRODSEXTERNALLOCAL)..."; \ - tar zxf $(IRODSEXTERNALLOCAL); \ + @echo "Unpacking $(IRODSEXTERNALLOCAL)..."; \ + $(V_at)tar zxf $(IRODSEXTERNALLOCAL); \ fi $(PGUNIXODBCARCHIVE) : echo "Getting PostgreSQL and unixODBC source for MacOSX..."; \ - curl -o $(PGUNIXODBCARCHIVE) -z $(PGUNIXODBCARCHIVE) $(RENCI_FTP_EXTERNAL)/$(PGUNIXODBCARCHIVE) > /dev/null 2>&1; + $(V_at)curl -o $(PGUNIXODBCARCHIVE) -z $(PGUNIXODBCARCHIVE) $(RENCI_FTP_EXTERNAL)/$(PGUNIXODBCARCHIVE) > /dev/null 2>&1; postgresql-$(PG_VERSION)/Makefile : $(PGUNIXODBCARCHIVE) tar zxf $(PGUNIXODBCARCHIVE); \ @@ -93,8 +93,8 @@ endif generate : build @echo "Building $(IRODSEXTERNALARCHIVE)..." - @tar zfc $(IRODSEXTERNALARCHIVE) --exclude "*.tar.gz" --exclude "*.zip" --exclude "*cmake*" --exclude "Makefile" * - @cp $(IRODSEXTERNALARCHIVE) $(IRODSEXTERNALLOCAL) + $(V_at)tar zfc $(IRODSEXTERNALARCHIVE) --exclude "*.tar.gz" --exclude "*.zip" --exclude "*cmake*" --exclude "Makefile" * + $(V_at)cp $(IRODSEXTERNALARCHIVE) $(IRODSEXTERNALLOCAL) $(LIB_MYSQLUDF_PREG_ARCHIVE) : @wget $(RENCI_FTP_EXTERNAL)/$(LIB_MYSQLUDF_PREG_ARCHIVE) 2>&1 diff --git a/iRODS/clients/c_api_test/Makefile b/iRODS/clients/c_api_test/Makefile index 7204b8092c..43d641fd90 100644 --- a/iRODS/clients/c_api_test/Makefile +++ b/iRODS/clients/c_api_test/Makefile @@ -57,7 +57,7 @@ LDFLAGS += -lstdc++ LDFLAGS += -rdynamic default: - @$(GCC) $(CFLAGS) -o mytest test.c $(LDFLAGS) + $(V_at)$(GCC) $(CFLAGS) -o mytest test.c $(LDFLAGS) clean: @echo "Cleaning C API test..." diff --git a/iRODS/clients/fuse/Makefile b/iRODS/clients/fuse/Makefile index d444890c88..0d020e5d6e 100644 --- a/iRODS/clients/fuse/Makefile +++ b/iRODS/clients/fuse/Makefile @@ -136,15 +136,15 @@ fuse: $(LIB_OBJS) $(OBJS) $(BINS) $(objDir)/%.o: $(srcDir)/%.cpp $(LIBRARY) @echo "Compile fuse `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(reObjDir)/%.o: $(reSrcDir)/%.c $(LIBRARY) @echo "Compile fuse `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(binDir)/%: $(objDir)/%.o $(LIB_OBJS) @echo "Link fuse `basename $@`..." - @$(LDR) -o $@ $< $(LIB_OBJS) $(SVR_OBJS) $(LDFLAGS) $(BOOST_LIBS) $(LDRTFLAGS) -lcrypto -lssl + $(V_at)$(LDR) -o $@ $< $(LIB_OBJS) $(SVR_OBJS) $(LDFLAGS) $(BOOST_LIBS) $(LDRTFLAGS) -lcrypto -lssl diff --git a/iRODS/clients/icommands/Makefile b/iRODS/clients/icommands/Makefile index 8fef765199..c8d3b37779 100644 --- a/iRODS/clients/icommands/Makefile +++ b/iRODS/clients/icommands/Makefile @@ -196,11 +196,11 @@ icommands: $(OBJS) $(BINS) $(BOOST_LIBS) $(objDir)/%.o: $(srcDir)/%.cpp $(LIBRARY) $(BOOST_LIBS) @echo "Compile icommand `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(binDir)/%: $(objDir)/%.o $(BOOST_LIBS) @echo "Link icommand `basename $@`..." - @$(LDR) -o $@ $< $(LDFLAGS) + $(V_at)$(LDR) -o $@ $< $(LDFLAGS) # Show compile flags print_cflags: diff --git a/iRODS/clients/icommands/rulegen/Makefile b/iRODS/clients/icommands/rulegen/Makefile index 601585e51b..8f1db4542a 100644 --- a/iRODS/clients/icommands/rulegen/Makefile +++ b/iRODS/clients/icommands/rulegen/Makefile @@ -81,11 +81,11 @@ rulegen: $(OBJS) $(BINS) $(objDir)/%.o: $(srcDir)/%.c @echo "Compile rulegen `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(binDir)/%: $(objDir)/%.o @echo "Link `basename $@`..." - @$(LDR) -g -o $@ $< $(LDFLAGS) + $(V_at)$(LDR) -g -o $@ $< $(LDFLAGS) diff --git a/iRODS/config/config.mk.in b/iRODS/config/config.mk.in index 2f68e86d4f..0594aa5d5c 100644 --- a/iRODS/config/config.mk.in +++ b/iRODS/config/config.mk.in @@ -215,6 +215,16 @@ CCMALLOC_DIR=/data/mwan/rods/ccmalloc/ccmalloc-0.4.0 endif +# VERBOSE - specify whether to show compilation commands +ifndef VERBOSE +V_at = @ +else ifeq ($(VERBOSE),0) +V_at = @ +else +V_at = +endif + + # IRODS_FS - specify that irodsFuse should be built # The latest version is 26 for release 2.7. It default to 21 if not defined IRODS_FS = 1 diff --git a/iRODS/lib/Makefile b/iRODS/lib/Makefile index 9d62eefc5d..eb8295be67 100644 --- a/iRODS/lib/Makefile +++ b/iRODS/lib/Makefile @@ -199,8 +199,8 @@ $(LIBRARY): $(OBJS) $(BOOST_LIBS) # $(CC) -D${OS_platform} -fPIC "-Wl,-E" -shared -o $(LIBRARY) $(OBJS) @echo "Building lib$(LIBRARY_NAME).a" @rm -f $(LIBRARY) - @$(AR) $(AROPT) $(LIBRARY) $^ - @$(RANLIB) $(LIBRARY) + $(V_at)$(AR) $(AROPT) $(LIBRARY) $^ + $(V_at)$(RANLIB) $(LIBRARY) # Server configuration $(svrConfigDir)/irodsHost: @@ -224,21 +224,21 @@ clean: # Build core $(LIB_CORE_OBJS): $(libCoreObjDir)/%.o: $(libCoreSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile core `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Build API $(LIB_API_OBJS): $(libApiObjDir)/%.o: $(libApiSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile api `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Build Hasher $(LIB_HASHER_OBJS): $(libHasherObjDir)/%.o: $(libHasherSrcDir)/%.cpp $(configMk) $(platformMk) @echo "Compile Hasher `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(LIB_RBUDP_OBJS): $(libRbudpObjDir)/%.o: $(libRbudpSrcDir)/%.cpp $(configMk) $(platformMk) @echo "Compile rbudp `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Build logging source rodslog: $(LOG_SRC) diff --git a/iRODS/server/Makefile b/iRODS/server/Makefile index 511e18522f..cb994551a0 100644 --- a/iRODS/server/Makefile +++ b/iRODS/server/Makefile @@ -10,7 +10,8 @@ # server build the servers # clean clean out all object files # -# To see the gcc command lines as executed, change "@$(CC)" to "$(CC)". +# To see the gcc command lines as executed, use "make VERBOSE=1" or run +# build.sh with "--verbose". include ../config/external_versions.txt @@ -349,81 +350,81 @@ BOOST_LIBS = $(BOOST_DIR)/stage/lib/libboost_system.a \ db_plugin_with_re: $(DB_PLUGIN_SRC) @echo "Compile With RE `basename $@`..." - @$(CC) -c $(CFLAGS) $(DB_PLUGIN_SRC) -o $(DB_PLUGIN_OBJ) + $(V_at)$(CC) -c $(CFLAGS) $(DB_PLUGIN_SRC) -o $(DB_PLUGIN_OBJ) db_plugin_with_no_re: $(DB_PLUGIN_SRC) @echo "Compile Without RE `basename $@`..." - @$(CC) -DLINK_NO_OP_RE_MGR $(CFLAGS) -c $(DB_PLUGIN_SRC) -o $(DB_PLUGIN_OBJ_WITH_NO_RE) + $(V_at)$(CC) -DLINK_NO_OP_RE_MGR $(CFLAGS) -c $(DB_PLUGIN_SRC) -o $(DB_PLUGIN_OBJ_WITH_NO_RE) # Compilation Targets # # Build server API $(SVR_API_OBJS): $(svrApiObjDir)/%.o: $(svrApiSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile api `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Build server core $(SVR_CORE_OBJS): $(svrCoreObjDir)/%.o: $(svrCoreSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile core `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Build server drivers $(SVR_DRIVERS_OBJS): $(svrDriversObjDir)/%.o: $(svrDriversSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile drivers `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Build server ICAT $(SVR_ICAT_OBJS): $(svrIcatObjDir)/%.o: $(svrIcatSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile icat `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Build server DBR $(SVR_DBR_OBJS): $(svrIcatObjDir)/%.o: $(svrIcatSrcDir)/%.cpp $(BOOST_LIBS) @echo "Compile dbr `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Builder server rule engine $(SVR_RE_OBJS): $(svrReObjDir)/%.o: $(svrReSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile re `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # Servers # # Agent $(svrCoreObjDir)/rodsAgent.o: $(svrCoreObjDir)/%.o: $(svrCoreSrcDir)/%.cpp $(LIBRARY) $(OBJS) $(BOOST_LIBS) @echo "Compile agent server `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(serverBinDir)/irodsAgent: db_plugin_with_re $(svrCoreObjDir)/rodsAgent.o $(LIBRARY) $(OBJS) $(BOOST_LIBS) @echo "Link agent server `basename $@`..." - @$(LDR) -o $@ $(svrCoreObjDir)/rodsAgent.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) $(AG_LDADD) + $(V_at)$(LDR) -o $@ $(svrCoreObjDir)/rodsAgent.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) $(AG_LDADD) # Rule engine $(svrCoreObjDir)/irodsReServer.o: $(svrCoreObjDir)/%.o: $(svrCoreSrcDir)/%.cpp $(LIBRARY) $(OBJS) @echo "Compile rule engine server `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(serverBinDir)/irodsReServer: db_plugin_with_re $(svrCoreObjDir)/irodsReServer.o $(LIBRARY) $(OBJS) $(BOOST_LIBS) @echo "Link rule engine server `basename $@`..." - @$(LDR) -o $@ $(svrCoreObjDir)/irodsReServer.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) + $(V_at)$(LDR) -o $@ $(svrCoreObjDir)/irodsReServer.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) # RODS $(svrCoreObjDir)/rodsServer.o: $(svrCoreObjDir)/%.o: $(svrCoreSrcDir)/%.cpp $(LIBRARY) $(OBJS) $(BOOST_LIBS) @echo "Compile rods server `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(serverBinDir)/irodsServer: db_plugin_with_re $(svrCoreObjDir)/rodsServer.o $(LIBRARY) $(OBJS) $(BOOST_LIBS) @echo "Link rods server `basename $@`..." - @$(LDR) -o $@ $(svrCoreObjDir)/rodsServer.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) + $(V_at)$(LDR) -o $@ $(svrCoreObjDir)/rodsServer.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) # xmsg server $(svrCoreObjDir)/irodsXmsgServer.o: $(svrCoreObjDir)/%.o: $(svrCoreSrcDir)/%.cpp $(LIBRARY) $(OBJS) @echo "Compile xmsg server `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(serverBinDir)/irodsXmsgServer: db_plugin_with_re $(svrCoreObjDir)/irodsXmsgServer.o $(LIBRARY) $(OBJS) $(BOOST_LIBS) @echo "Link xmsg server `basename $@`..." - @$(LDR) -o $@ $(svrCoreObjDir)/irodsXmsgServer.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) + $(V_at)$(LDR) -o $@ $(svrCoreObjDir)/irodsXmsgServer.o $(LIBRARY) $(OBJS) $(DB_PLUGIN_OBJ) $(BOOST_LIBS) $(LDFLAGS) # @@ -431,28 +432,28 @@ $(serverBinDir)/irodsXmsgServer: db_plugin_with_re $(svrCoreObjDir)/irodsXmsgSer # $(svrAuthObjDir)/PamAuthCheck.o: $(svrAuthSrcDir)/PamAuthCheck.cpp @echo "Compile PamAuthCheck utility `basename $@`..." - @$(CC) -c $(AUTH_CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(AUTH_CFLAGS) -o $@ $< $(serverBinDir)/PamAuthCheck: $(svrAuthObjDir)/PamAuthCheck.o @echo "Link PamAuthCheck utility `basename $@`..." - @$(CC) -o $@ $(svrAuthObjDir)/PamAuthCheck.o $(AUTH_LDFLAGS) + $(V_at)$(CC) -o $@ $(svrAuthObjDir)/PamAuthCheck.o $(AUTH_LDFLAGS) # # Tests # $(TEST_OBJS): $(svrTestObjDir)/%.o: $(svrTestSrcDir)/%.cpp $(DEPEND) $(BOOST_LIBS) @echo "Compile server test `basename $@`..." - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< # reTest $(svrTestBinDir)/reTest: $(svrTestObjDir)/reTest.o $(OBJS) $(BOOST_LIBS) $(BOOST_LIBS) @echo "Link server test `basename $@`..." - @$(LDR) -o $@ $^ $(LDFLAGS) $(BOOST_LIBS) + $(V_at)$(LDR) -o $@ $^ $(LDFLAGS) $(BOOST_LIBS) # chl $(svrTestBinDir)/test_chl: db_plugin_with_no_re $(svrTestObjDir)/test_chl.o $(SVR_ICAT_OBJS) $(LIBRARY) $(BOOST_LIBS) $(DB_IFACE_OBJS) @echo "Link server test `basename $@`..." - @$(LDR) -o $@ $(svrTestObjDir)/test_chl.o $(LIBRARY) $(SVR_ICAT_OBJS) $(DB_PLUGIN_OBJ_WITH_NO_RE) $(DB_IFACE_OBJS) $(BOOST_LIBS) $(LDFLAGS) + $(V_at)$(LDR) -o $@ $(svrTestObjDir)/test_chl.o $(LIBRARY) $(SVR_ICAT_OBJS) $(DB_PLUGIN_OBJ_WITH_NO_RE) $(DB_IFACE_OBJS) $(BOOST_LIBS) $(LDFLAGS) # # Rule Admin Targets @@ -461,7 +462,7 @@ ruleadmin:: $(serverBinDir)/ruleAdmin @cp $(serverBinDir)/ruleAdmin /misc/www/projects/srb-secure/cgi-bin/ruleAdminRaja.cgi $(svrCoreObjDir)/ruleAdmin.o: $(svrCoreObjDir)/%.o: %.cpp $(LIBRARY) $(OBJS) - @$(CC) -c $(CFLAGS) -o $@ $< + $(V_at)$(CC) -c $(CFLAGS) -o $@ $< $(serverBinDir)/ruleAdmin: $(svrCoreObjDir)/ruleAdmin.o $(LIBRARY) $(OBJS) - @$(LDR) -o $@ $^ $(LDFLAGS) + $(V_at)$(LDR) -o $@ $^ $(LDFLAGS) diff --git a/packaging/build.sh b/packaging/build.sh index 3bfc9cc2de..3b7fdaa2a4 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -10,6 +10,7 @@ CPUJOBS="" RELEASE="0" BUILDIRODS="1" PORTABLE="0" +VERBOSE="0" COVERAGEBUILDDIR="/var/lib/irods" PREFLIGHT="" PREFLIGHTDOWNLOAD="" @@ -29,9 +30,11 @@ Options: -r Build a release package (no debugging information, optimized) -s Skip compilation of iRODS source -p Portable option, ignores OS and builds a tar.gz +-v Show the actual compilation commands executed Long Options: --run-in-place Build server for in-place execution (not recommended) +--verbose Show the actual compilation commands executed Examples: $SCRIPTNAME icat postgres @@ -89,6 +92,7 @@ do --release) args="${args}-r ";; --skip) args="${args}-s ";; --portable) args="${args}-p ";; + --verbose) args="${args}-v ";; --run-in-place) args="${args}-z ";; # pass through anything else *) [[ "${arg:0:1}" == "-" ]] || delim="\"" @@ -98,7 +102,7 @@ done # reset the translated args eval set -- $args # now we can process with getopts -while getopts ":chfj:rspz" opt; do +while getopts ":chfj:rspvz" opt; do case $opt in c) COVERAGE="1" @@ -132,6 +136,10 @@ while getopts ":chfj:rspz" opt; do PORTABLE="1" echo "-p detected -- Building portable package" ;; + v) + VERBOSE="1" + echo "-v/--verbose detected -- Showing compilation commands" + ;; z) RUNINPLACE="1" echo "--run-in-place detected -- Building for in-place execution" @@ -276,7 +284,12 @@ detect_number_of_cpus_and_set_makejcmd() { else CPUCOUNT=$(( $DETECTEDCPUCOUNT + 3 )) fi - MAKEJCMD="make --no-print-directory -j $CPUCOUNT" + if [ "$VERBOSE" == "1" ] ; then + VERBOSITYOPTION="VERBOSE=1" + else + VERBOSITYOPTION="--no-print-directory" + fi + MAKEJCMD="make $VERBOSITYOPTION -j $CPUCOUNT" # print out CPU information echo "${text_cyan}${text_bold}-------------------------------------" diff --git a/plugins/Makefile.base b/plugins/Makefile.base index 19d946facb..22ec8c1094 100644 --- a/plugins/Makefile.base +++ b/plugins/Makefile.base @@ -70,15 +70,15 @@ clean-base: $(AGNOSTIC_OBJS) : $(SODIR)/lib%.so : $(SRCDIR)/%.cpp $(DEPDIR)/%.d $(DEPFILE) $(AGNOSTIC_DEPS) @echo "Compile plugin `basename $@`..." - @$(GCC) $(CFLAGS) $(AGNOSTIC_CFLAGS) $(INC) -fPIC -shared -o $@ $< $(LDADD) $(EXTRALIBS) $(AGNOSTIC_LIBS) + $(V_at)$(GCC) $(CFLAGS) $(AGNOSTIC_CFLAGS) $(INC) -fPIC -shared -o $@ $< $(LDADD) $(EXTRALIBS) $(AGNOSTIC_LIBS) $(SERVER_OBJS) : $(SODIR)/lib%_server.so : $(SRCDIR)/%.cpp $(DEPDIR)/%.d $(DEPFILE) $(SERVER_DEPS) @echo "Compile plugin `basename $@`..." - @$(GCC) $(CFLAGS) $(SERVER_CFLAGS) $(INC) -fPIC -shared -o $@ $< $(LDADD) $(EXTRALIBS) $(SERVER_LIBS) + $(V_at)$(GCC) $(CFLAGS) $(SERVER_CFLAGS) $(INC) -fPIC -shared -o $@ $< $(LDADD) $(EXTRALIBS) $(SERVER_LIBS) $(CLIENT_OBJS) : $(SODIR)/lib%_client.so : $(SRCDIR)/%.cpp $(DEPDIR)/%.d $(DEPFILE) $(CLIENT_DEPS) @echo "Compile plugin `basename $@`..." - @$(GCC) $(CFLAGS) $(CLIENT_CFLAGS) $(INC) -fPIC -shared -o $@ $< $(LDADD) $(EXTRALIBS) $(CLIENT_LIBS) + $(V_at)$(GCC) $(CFLAGS) $(CLIENT_CFLAGS) $(INC) -fPIC -shared -o $@ $< $(LDADD) $(EXTRALIBS) $(CLIENT_LIBS) $(DEPFILE): $(DEPS) @-rm -f $(DEPFILE) > /dev/null 2>&1 @@ -88,7 +88,7 @@ $(DEPFILE): $(DEPS) $(DEPS): $(DEPDIR)/%.d : $(SRCDIR)/%.cpp $(HEADERS) @-mkdir -p $(DEPDIR) > /dev/null 2>&1 - @$(GCC) $(CFLAGS) $(INC) -MM $< -MT $(patsubst $(DEPDIR)/%.d, $(SODIR)/lib%.so, $@) -MF $@ + $(V_at)$(GCC) $(CFLAGS) $(INC) -MM $< -MT $(patsubst $(DEPDIR)/%.d, $(SODIR)/lib%.so, $@) -MF $@ -include $(DEPFILE) diff --git a/plugins/auth/Makefile.base b/plugins/auth/Makefile.base index a71dd82263..077e3e47e6 100644 --- a/plugins/auth/Makefile.base +++ b/plugins/auth/Makefile.base @@ -46,7 +46,7 @@ clean: $(FULLTARGET): $(OBJS) @echo "Building Auth Plugins" @-mkdir -p $(SODIR) > /dev/null 2>&1 - @$(GCC) $(MY_CFLAG) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) $(EXTRALIBS) ../../../iRODS/lib/api/obj/rcAuthCheck.o + $(V_at)$(GCC) $(MY_CFLAG) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) $(EXTRALIBS) ../../../iRODS/lib/api/obj/rcAuthCheck.o $(OBJDIR)/%.o: %.cpp - @$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< + $(V_at)$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< diff --git a/plugins/database/Makefile.base b/plugins/database/Makefile.base index 166b032d25..012143f307 100644 --- a/plugins/database/Makefile.base +++ b/plugins/database/Makefile.base @@ -69,23 +69,23 @@ clean: $(FULLTARGET): $(OBJS) @echo "Building Database Plugins" @-mkdir -p $(SODIR) > /dev/null 2>&1 - @$(GCC) $(INC) -D$(OS_platform) $(CFLAGS) $(LDRFLAGS) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) $(EXTRALIBS) $(EXTRA_LDRFLAGS) $(DBMS_LIB) + $(V_at)$(GCC) $(INC) -D$(OS_platform) $(CFLAGS) $(LDRFLAGS) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) $(EXTRALIBS) $(EXTRA_LDRFLAGS) $(DBMS_LIB) $(OBJDIR)/%.o: ../src/%.cpp - @$(GCC) $(INC) $(EXTRA_CFLAGS) -D$(OS_platform) -fPIC -c -g -o $@ $< + $(V_at)$(GCC) $(INC) $(EXTRA_CFLAGS) -D$(OS_platform) -fPIC -c -g -o $@ $< $(DB_PLUGIN_OBJ_WITH_NO_RE): $(DB_PLUGIN_SRC) @echo "Compile Without RE `basename $@`..." - @$(CC) -DLINK_NO_OP_RE_MGR $(EXTRA_CFLAGS) $(INC) -c $(DB_PLUGIN_SRC) -o $(DB_PLUGIN_OBJ_WITH_NO_RE) + $(V_at)$(CC) -DLINK_NO_OP_RE_MGR $(EXTRA_CFLAGS) $(INC) -c $(DB_PLUGIN_SRC) -o $(DB_PLUGIN_OBJ_WITH_NO_RE) $(SODIR)/test_cll: $(OBJDIR)/test_cll.o $(CLL_OBJS) $(LIBRARY) $(BOOST_LIBS) @echo "Link server test `basename $@`..." - @$(LDR) -o $@ $^ $(LIBRARY) $(LDFLAGS) $(BOOST_LIBS) $(DBMS_LIB) $(LDRFLAGS) $(EXTRA_LDRFLAGS) -fPIC -rdynamic -ldl -lpthread -lssl -lcrypto + $(V_at)$(LDR) -o $@ $^ $(LIBRARY) $(LDFLAGS) $(BOOST_LIBS) $(DBMS_LIB) $(LDRFLAGS) $(EXTRA_LDRFLAGS) -fPIC -rdynamic -ldl -lpthread -lssl -lcrypto $(SODIR)/test_genq: $(OBJDIR)/test_genq.o $(DB_PLUGIN_OBJ_WITH_NO_RE) $(CLL_OBJS) $(GENQ_OBJS) $(CHL_OBJS) $(LIBRARY) $(BOOST_LIBS) @echo "Link server test `basename $@`..." - @$(LDR) -o $@ $^ $(LIBRARY) $(LDFLAGS) $(DBMS_LIB) $(LDRFLAGS) $(EXTRA_LDRFLAGS) -fPIC -rdynamic -ldl -lpthread -lssl -lcrypto + $(V_at)$(LDR) -o $@ $^ $(LIBRARY) $(LDFLAGS) $(DBMS_LIB) $(LDRFLAGS) $(EXTRA_LDRFLAGS) -fPIC -rdynamic -ldl -lpthread -lssl -lcrypto $(SODIR)/test_genu: $(OBJDIR)/test_genu.o $(GENU_OBJS) $(CHL_OBJS) $(CLL_OBJS) $(DB_PLUGIN_OBJ_WITH_NO_RE) $(LIBRARY) $(BOOST_LIBS) @echo "Link server test `basename $@`..." - @$(LDR) -o $@ $^ $(LIBRARY) $(LDFLAGS) $(DBMS_LIB) $(LDRFLAGS) $(EXTRA_LDRFLAGS) -fPIC -rdynamic -ldl -lpthread -lssl -lcrypto + $(V_at)$(LDR) -o $@ $^ $(LIBRARY) $(LDFLAGS) $(DBMS_LIB) $(LDRFLAGS) $(EXTRA_LDRFLAGS) -fPIC -rdynamic -ldl -lpthread -lssl -lcrypto diff --git a/plugins/microservices/mso_drivers/Makefile.base b/plugins/microservices/mso_drivers/Makefile.base index b1be532096..ae3363b5ef 100644 --- a/plugins/microservices/mso_drivers/Makefile.base +++ b/plugins/microservices/mso_drivers/Makefile.base @@ -30,7 +30,7 @@ ifeq ($(IRODS_BUILD_COVERAGE), 1) GCC += -fprofile-arcs -ftest-coverage -lgcov OBJS = $(patsubst %.cpp, %.o, $(SRCS)) %.o: %.cpp - @$(GCC) $(CFLAGS) $(INC) -D$(OS_platform) -fPIC -c -g -o $@ $< + $(V_at)$(GCC) $(CFLAGS) $(INC) -D$(OS_platform) -fPIC -c -g -o $@ $< endif .PHONY: clean @@ -44,7 +44,7 @@ clean: $(FULLTARGET): $(OBJS) @-mkdir -p $(SODIR) > /dev/null 2>&1 - @$(GCC) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) ../../../../iRODS/lib/core/obj/irods_plugin_base.o $(EXTRALIBS) + $(V_at)$(GCC) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) ../../../../iRODS/lib/core/obj/irods_plugin_base.o $(EXTRALIBS) $(OBJDIR)/%.o: %.cpp - @$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< + $(V_at)$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< diff --git a/plugins/network/Makefile.base b/plugins/network/Makefile.base index 1e6fa6547f..34a24adc8d 100644 --- a/plugins/network/Makefile.base +++ b/plugins/network/Makefile.base @@ -45,7 +45,7 @@ clean: $(FULLTARGET): $(OBJS) @echo "Building Network Plugins" @-mkdir -p $(SODIR) > /dev/null 2>&1 - @$(GCC) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) $(EXTRALIBS) + $(V_at)$(GCC) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) $(EXTRALIBS) $(OBJDIR)/%.o: %.cpp - @$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< + $(V_at)$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< diff --git a/plugins/resources/Makefile.base b/plugins/resources/Makefile.base index 6c02b0451c..e8d1f2524b 100644 --- a/plugins/resources/Makefile.base +++ b/plugins/resources/Makefile.base @@ -52,7 +52,7 @@ clean: $(FULLTARGET): $(OBJS) @-mkdir -p $(SODIR) > /dev/null 2>&1 - @$(GCC) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) ../../../iRODS/lib/core/obj/irods_plugin_base.o $(EXTRALIBS) + $(V_at)$(GCC) $(LDRFLAGS) -D$(OS_platform) -fPIC $(LDADD) -shared -o $(FULLTARGET) $(OBJS) ../../../iRODS/lib/core/obj/irods_plugin_base.o $(EXTRALIBS) $(OBJDIR)/%.o: %.cpp - @$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< + $(V_at)$(GCC) $(MY_CFLAG) -D$(OS_platform) -fPIC -c -g -o $@ $< From ff43f6a6c3293e066d46fb48753d0de1e5de5b85 Mon Sep 17 00:00:00 2001 From: John Marshall Date: Wed, 29 Apr 2015 08:45:22 +0100 Subject: [PATCH 19/48] [#2666] Add missing option documentation In particular, -j/--jobs was missing from the usage entirely. --- packaging/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packaging/build.sh b/packaging/build.sh index 3b7fdaa2a4..c17f94fabc 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -27,13 +27,21 @@ Options: -c Build with coverage support (gcov) -f Fast build, skip dev, runtime, and icommands packages -h Show this help +-j NUM Run NUM make jobs simultaneously (instead of using all cores) -r Build a release package (no debugging information, optimized) -s Skip compilation of iRODS source -p Portable option, ignores OS and builds a tar.gz -v Show the actual compilation commands executed Long Options: +--coverage Build with coverage support (gcov) +--fast Fast build, skip dev, runtime, and icommands packages +--help Show this help +--jobs NUM Run NUM make jobs simultaneously (instead of using all cores) +--portable Portable option, ignores OS and builds a tar.gz +--release Build a release package (no debugging information, optimized) --run-in-place Build server for in-place execution (not recommended) +--skip Skip compilation of iRODS source --verbose Show the actual compilation commands executed Examples: From 7b6794e385abb4aac4ee399d8dc158ff122de813 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 09:52:07 -0400 Subject: [PATCH 20/48] [#2666] consolidate usage notes --- packaging/build.sh | 48 ++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/packaging/build.sh b/packaging/build.sh index c17f94fabc..82db82b26f 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -24,25 +24,15 @@ Usage: $SCRIPTNAME docs Usage: $SCRIPTNAME clean Options: --c Build with coverage support (gcov) --f Fast build, skip dev, runtime, and icommands packages --h Show this help --j NUM Run NUM make jobs simultaneously (instead of using all cores) --r Build a release package (no debugging information, optimized) --s Skip compilation of iRODS source --p Portable option, ignores OS and builds a tar.gz --v Show the actual compilation commands executed - -Long Options: ---coverage Build with coverage support (gcov) ---fast Fast build, skip dev, runtime, and icommands packages ---help Show this help ---jobs NUM Run NUM make jobs simultaneously (instead of using all cores) ---portable Portable option, ignores OS and builds a tar.gz ---release Build a release package (no debugging information, optimized) ---run-in-place Build server for in-place execution (not recommended) ---skip Skip compilation of iRODS source ---verbose Show the actual compilation commands executed +-c, --coverage Build with coverage support (gcov) +-f, --fast Fast build, skip dev, runtime, and icommands packages +-h, --help Show this help +-j, --jobs NUM Run NUM make jobs simultaneously (instead of using all cores) +-p, --portable Portable option, ignores OS and builds a tar.gz +-r, --release Build a release package (no debugging symbols, optimized) + --run-in-place Build server for in-place execution (not recommended) +-s, --skip Skip compilation of iRODS source +-v, --verbose Show the actual compilation commands executed Examples: $SCRIPTNAME icat postgres @@ -115,7 +105,7 @@ while getopts ":chfj:rspvz" opt; do c) COVERAGE="1" TARGET=$2 - echo "-c detected -- Building iRODS with coverage support (gcov)" + echo "-c, --coverage detected -- Building iRODS with coverage support (gcov)" echo "${text_green}${text_bold}TARGET=[$TARGET]${text_reset}" if [ "$TARGET" == "icat" ] ; then echo "${text_green}${text_bold}TARGET is ICAT${text_reset}" @@ -126,27 +116,27 @@ while getopts ":chfj:rspvz" opt; do ;; f) FAST="1" - echo "-f detected -- Skipping dev, runtime, and icommands packages" + echo "-f, --fast detected -- Skipping dev, runtime, and icommands packages" ;; j) CPUJOBS="$OPTARG" - echo "-j detected -- Building with $CPUJOBS make jobs" + echo "-j, --jobs detected -- Building with $CPUJOBS make jobs" + ;; + p) + PORTABLE="1" + echo "-p, --portable detected -- Building portable package" ;; r) RELEASE="1" - echo "-r detected -- Building a RELEASE package of iRODS" + echo "-r, --release detected -- Building a RELEASE package of iRODS" ;; s) BUILDIRODS="0" - echo "-s detected -- Skipping iRODS compilation" - ;; - p) - PORTABLE="1" - echo "-p detected -- Building portable package" + echo "-s, --skip detected -- Skipping iRODS compilation" ;; v) VERBOSE="1" - echo "-v/--verbose detected -- Showing compilation commands" + echo "-v, --verbose detected -- Showing compilation commands" ;; z) RUNINPLACE="1" From d00f7e2ed323dae8a4c446a077fb664091cfaeb9 Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Wed, 29 Apr 2015 12:08:46 -0400 Subject: [PATCH 21/48] [#858] Disable xmsg test when testing ssl --- tests/pydevtest/test_xmsg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pydevtest/test_xmsg.py b/tests/pydevtest/test_xmsg.py index 6779aca8c8..2677ea4c0c 100644 --- a/tests/pydevtest/test_xmsg.py +++ b/tests/pydevtest/test_xmsg.py @@ -38,7 +38,7 @@ def tearDown(self): os.rename(self.serverConfigFileBackup, self.serverConfigFile) lib.restart_irods_server() - @unittest.skipIf(configuration.TOPOLOGY_FROM_RESOURCE_SERVER, "Skip for topology testing from resource server") + @unittest.skipIf(configuration.TOPOLOGY_FROM_RESOURCE_SERVER or configuration.USE_SSL, "Skip for topology testing from resource server or SSL") def test_send_and_receive_one_xmsg(self): message = 'Hello World!' From aac77600a1daef98f0d8933c54f692a9564342c6 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Wed, 29 Apr 2015 13:05:16 -0400 Subject: [PATCH 22/48] [#2562] test for ichmod -r --- tests/pydevtest/test_ichmod.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tests/pydevtest/test_ichmod.py diff --git a/tests/pydevtest/test_ichmod.py b/tests/pydevtest/test_ichmod.py new file mode 100644 index 0000000000..14448f83d6 --- /dev/null +++ b/tests/pydevtest/test_ichmod.py @@ -0,0 +1,29 @@ +import os +import re +import sys + +if sys.version_info < (2, 7): + import unittest2 as unittest +else: + import unittest + +import configuration +from resource_suite import ResourceBase +import lib + + +class Test_iChmod(ResourceBase, unittest.TestCase): + def setUp(self): + super(Test_iChmod, self).setUp() + + def tearDown(self): + super(Test_iChmod, self).tearDown() + + def test_ichmod_r(self): + self.admin.assert_icommand('imkdir -p sub_dir1\\\\%/subdir2/') + self.admin.assert_icommand('ichmod read ' + self.user0.username + ' -r sub_dir1\\\\%/') + self.admin.assert_icommand('ichmod inherit -r sub_dir1\\\\%/') + filepath = os.path.join(self.admin.local_session_dir, 'file') + lib.make_file( filepath, 1 ) + self.admin.assert_icommand('iput ' + filepath + ' sub_dir1\\\\%/subdir2/') + self.user0.assert_icommand('iget ' + self.admin.session_collection + '/sub_dir1\\\\%/subdir2/file ' + os.path.join(self.user0.local_session_dir, '')) From 6c1eece0f919da961e0c8e1deb7d76acd823ca4d Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 13:22:11 -0400 Subject: [PATCH 23/48] [#2666] remove @ from within single line command --- external/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/Makefile b/external/Makefile index d5e190b943..02cdb7518a 100644 --- a/external/Makefile +++ b/external/Makefile @@ -57,11 +57,11 @@ default : fetch fetch : @echo "Getting $(IRODSEXTERNALARCHIVE) -> $(IRODSEXTERNALLOCAL)..." - @filemtime=`stat -c %Y $(IRODSEXTERNALLOCAL) 2> /dev/null`; \ - $(V_at)curl -o $(IRODSEXTERNALLOCAL) -z $(IRODSEXTERNALLOCAL) $(RENCI_FTP_BUILD)/$(IRODSEXTERNALARCHIVE) > /dev/null 2>&1; \ + $(V_at)filemtime=`stat -c %Y $(IRODSEXTERNALLOCAL) 2> /dev/null`; \ + curl -o $(IRODSEXTERNALLOCAL) -z $(IRODSEXTERNALLOCAL) $(RENCI_FTP_BUILD)/$(IRODSEXTERNALARCHIVE) > /dev/null 2>&1; \ if [ "$$filemtime" != "`stat -c %Y $(IRODSEXTERNALLOCAL) 2> /dev/null`" ] ; then \ - @echo "Unpacking $(IRODSEXTERNALLOCAL)..."; \ - $(V_at)tar zxf $(IRODSEXTERNALLOCAL); \ + echo "Unpacking $(IRODSEXTERNALLOCAL)..."; \ + tar zxf $(IRODSEXTERNALLOCAL); \ fi $(PGUNIXODBCARCHIVE) : From de6335634cd3c9f9f1e35379c68fb19a11178eb7 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 13:22:27 -0400 Subject: [PATCH 24/48] [#2666] pass verbosity to database plugin --- packaging/build.sh | 9 ++++++--- plugins/database/build.sh | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/packaging/build.sh b/packaging/build.sh index 82db82b26f..90ee266346 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -1314,11 +1314,14 @@ if [ "$BUILDIRODS" == "1" ] ; then # build designated database plugin echo "" echo "${text_green}${text_bold}Building [$DATABASE_PLUGIN_TYPE] database plugin...${text_reset}" + DB_BUILD_CMD="$BUILDDIR/plugins/database/build.sh" + if [ "$VERBOSE" == "1" ] ; then + DB_BUILD_CMD="$DB_BUILD_CMD --verbose" + fi if [ "$RUNINPLACE" == "1" ] ; then - $BUILDDIR/plugins/database/build.sh --run-in-place $DATABASE_PLUGIN_TYPE - else - $BUILDDIR/plugins/database/build.sh $DATABASE_PLUGIN_TYPE + DB_BUILD_CMD="$DB_BUILD_CMD --run-in-place" fi + $DB_BUILD_CMD $DATABASE_PLUGIN_TYPE elif [ "$SERVER_TYPE" == "RESOURCE" ] ; then # build resource package $MAKEJCMD -C $BUILDDIR resource-package diff --git a/plugins/database/build.sh b/plugins/database/build.sh index 7cc302b85f..a147b689ee 100755 --- a/plugins/database/build.sh +++ b/plugins/database/build.sh @@ -18,12 +18,11 @@ Usage: $SCRIPTNAME oracle Options: --c Build with coverage support (gcov) --h Show this help --r Build a release package (no debugging information, optimized) - -Long Options: ---run-in-place Build for in-place execution (not recommended) +-c, --coverage Build with coverage support (gcov) +-h, --help Show this help +-r, --release Build a release package (no debugging information, optimized) + --run-in-place Build for in-place execution (not recommended) +-v, --verbose Show the actual compilation commands executed " # translate long options to short @@ -34,6 +33,7 @@ do --coverage) args="${args}-c ";; --help) args="${args}-h ";; --release) args="${args}-r ";; + --verbose) args="${args}-v ";; --run-in-place) args="${args}-z ";; # pass through anything else *) [[ "${arg:0:1}" == "-" ]] || delim="\"" @@ -43,23 +43,27 @@ done # reset the translated args eval set -- $args # now we can process with getopts -while getopts ":chrz" opt; do +while getopts ":chrvz" opt; do case $opt in c) COVERAGE="1" - echo "-c detected -- Building iRODS with coverage support (gcov)" + echo "-c, --coverage detected -- Building iRODS with coverage support (gcov)" ;; h) echo "$USAGE" ;; r) RELEASE="1" - echo "-r detected -- Building a RELEASE package" + echo "-r, --release detected -- Building a RELEASE package" ;; z) RUNINPLACE="1" echo "--run-in-place detected -- Building for in-place execution" ;; + v) + VERBOSE="1" + echo "-v, --verbose detected -- Showing compilation commands" + ;; \?) echo "Invalid option: -$OPTARG" >&2 ;; @@ -211,8 +215,13 @@ chmod +x $SETUP_FILE # =-=-=-=-=-=-=- # build the particular flavor of DB plugin +if [ "$VERBOSE" == "1" ] ; then + VERBOSITYOPTION="VERBOSE=1" +else + VERBOSITYOPTION="--no-print-directory" +fi cd $SCRIPTPATH -make ${DB_TYPE} +make ${VERBOSITYOPTION} ${DB_TYPE} # =-=-=-=-=-=-=- # package the plugin and associated files From 97c957d5faa98f805b87d0975cd17f014d8fd53f Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Wed, 29 Apr 2015 14:21:51 -0400 Subject: [PATCH 25/48] [#2467] test for irsync --- tests/pydevtest/test_irsync.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 tests/pydevtest/test_irsync.py diff --git a/tests/pydevtest/test_irsync.py b/tests/pydevtest/test_irsync.py new file mode 100644 index 0000000000..a862229a1d --- /dev/null +++ b/tests/pydevtest/test_irsync.py @@ -0,0 +1,26 @@ +import os +import re +import sys + +if sys.version_info < (2, 7): + import unittest2 as unittest +else: + import unittest + +import configuration +from resource_suite import ResourceBase +import lib + + +class Test_iRsync(ResourceBase, unittest.TestCase): + def setUp(self): + super(Test_iRsync, self).setUp() + + def tearDown(self): + super(Test_iRsync, self).tearDown() + + def test_irsync(self): + filepath = os.path.join(self.admin.local_session_dir, 'file') + lib.make_file( filepath, 1 ) + self.admin.assert_icommand('iput ' + filepath) + self.admin.assert_icommand('irsync -l ' + filepath + ' i:file') From 7b64fb6d0742d78ca0d98983640744970e7d2f02 Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Wed, 29 Apr 2015 15:21:19 -0400 Subject: [PATCH 26/48] [#2628] Remove legacy config handling from server_config.py --- packaging/server_config.py | 109 ++++++++++++++----------------------- 1 file changed, 42 insertions(+), 67 deletions(-) diff --git a/packaging/server_config.py b/packaging/server_config.py index 51d4397130..a7eca16782 100644 --- a/packaging/server_config.py +++ b/packaging/server_config.py @@ -11,49 +11,42 @@ def get_install_dir(): return os.path.dirname(os.path.dirname(os.path.realpath(__file__))) - -class CompatibilityDict(dict): - - def __init__(self, compatibility_listing, *args, **kwargs): - super(CompatibilityDict, self).__init__(*args, **kwargs) - key_dict = {} - for old, new in compatibility_listing: - key_dict[old] = new - key_dict[new] = old - self.key_dict = key_dict - - def __missing__(self, key): - compat_key = self.key_dict[key] - if compat_key in self.keys(): - return self[compat_key] - else: - raise KeyError(key) - +def is_binary_installation(): + return os.path.isfile(os.path.join(get_install_dir(), 'packaging', 'binary_installation.flag')) + +def get_config_dir(): + if is_binary_installation(): + return '/etc/irods' + return os.path.join(get_install_dir(), 'iRODS', 'server', 'config') + +def load_odbc_ini(filename): + rv = {} + with open(filename, 'r') as f: + for line in f: + if len(line) < 1: + continue + if line[0] in [';', '#']: + continue + if line[0] == '[': + continue + columns = line.split('=') + if len(columns) != 2: + continue + key = columns[0].strip() + value = columns[1].strip() + rv[key] = value + return rv class ServerConfig(object): - def __init__(self): - self.combined_config_dict = CompatibilityDict(compatibility_listing=[('DBPassword', 'db_password'), - ('DBUsername', 'db_username')]) - - # Binary installation - if os.path.isfile('/var/lib/irods/packaging/binary_installation.flag'): - self.capture('/etc/irods/server_config.json') - self.capture('/etc/irods/database_config.json') - # Run in place - elif os.path.isfile(get_install_dir() + '/iRODS/server/config/server_config.json'): - self.capture(get_install_dir() + '/iRODS/server/config/server_config.json') - self.capture(get_install_dir() + '/iRODS/server/config/database_config.json') - # Support deprecated pre-json config files through 4.1.x - else: - thefile = '/etc/irods/server.config' - # binary - if os.path.isfile(thefile): - cfg_file = thefile - # run-in-place - else: - cfg_file = get_install_dir() + '/iRODS/server/config/server.config' - self.capture(cfg_file, ' ') + self.combined_config_dict = {} + + config_files = ['server_config.json', 'database_config.json'] + for file_ in config_files: + fullpath = os.path.join(get_config_dir(), file_) + if not os.path.isfile(fullpath): + raise RuntimeError('Missing {0}\n{1}'.format(fullpath, os.listdir(get_config_dir()))) + self.capture(fullpath) self.capture(os.path.join(os.environ['HOME'], '.odbc.ini'), '=') @@ -61,34 +54,16 @@ def get(self, key): return self.combined_config_dict[key] def capture(self, cfg_file, sep=None): - # NOTE:: we want to make this programmatically detected - cfg_file = os.path.abspath(cfg_file) - name, ext = os.path.splitext(cfg_file) - with open(cfg_file, 'r') as f: - if '.json' == ext: - self.combined_config_dict.update(json.load(f)) - else: - for i, row in enumerate(f): - columns = row.split(sep) - # print columns - if columns[0] == '#': - continue - elif len(columns) > 1: - self.combined_config_dict[columns[0].rstrip()] = columns[1].rstrip() + _, ext = os.path.splitext(cfg_file) + if ext == '.json': + with open(cfg_file, 'r') as f: + update = json.load(f) + else: + update = load_odbc_ini(cfg_file) + self.combined_config_dict.update(update) def get_db_password(self): - try: - db_key = self.get('DBKey') - except KeyError: - return self.get('db_password') - - obfuscated_password = self.get('db_password') - p = subprocess.Popen(['iadmin', obfuscated_password, db_key], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - db_pass, db_err = p.communicate() - if p.returncode != 0: - raise RuntimeError('Failed to decode db password. stdout[{0}], stderr[{1}]'.format(stdout, stderr)) - return db_pass.split(':')[1].rstrip() + return self.get('db_password') # =-=-=-=-=-=-=-=-=-=-=-=-=- # POSTGRES @@ -99,7 +74,7 @@ def exec_pgsql_cmd(self, sql): sql += ';' sqlfile = 'tmpsqlfile' - with open(sqlfile, 'w+') as f: + with open(sqlfile, 'w') as f: f.write(sql) returncode, myout, myerr = self.exec_pgsql_file(sqlfile) os.unlink(sqlfile) From 399bf39d60472043013e618a77fd9676617b50ab Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 14:18:12 -0400 Subject: [PATCH 27/48] [#858] more s --- iRODS/clients/icommands/src/izonereport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iRODS/clients/icommands/src/izonereport.cpp b/iRODS/clients/icommands/src/izonereport.cpp index 78076bf4ab..8006a4c172 100644 --- a/iRODS/clients/icommands/src/izonereport.cpp +++ b/iRODS/clients/icommands/src/izonereport.cpp @@ -18,7 +18,7 @@ void usage() { "Usage: izonereport", "izonereport queries the entire iRODS Zone for configuration information.", "This configuration information will be generated in the form of a JSON", - "document which will validate using schemas found at http://schemas.irods.org.", + "document which will validate using schemas found at https://schemas.irods.org.", " -h this help", "" }; From 13cb38f475ae2a171ffee93da1c3d8ae3c4d5dc7 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 15:25:46 -0400 Subject: [PATCH 28/48] [#2536] add missing i --- iRODS/server/api/src/rsServerReport.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/iRODS/server/api/src/rsServerReport.cpp b/iRODS/server/api/src/rsServerReport.cpp index 035522864a..98b0b632a4 100644 --- a/iRODS/server/api/src/rsServerReport.cpp +++ b/iRODS/server/api/src/rsServerReport.cpp @@ -466,7 +466,7 @@ irods::error convert_service_account( // sanitize the keys json_object_set( _svc_acct, - "rods_server_control_plane_key", + "irods_server_control_plane_key", json_string( "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ) ); return SUCCESS(); @@ -532,7 +532,9 @@ irods::error convert_service_account( json_object_set( _svc_acct, "irods_encryption_num_hash_rounds", json_integer( my_env.rodsEncryptionNumHashRounds ) ); json_object_set( _svc_acct, "irods_encryption_algorithm", json_string( my_env.rodsEncryptionAlgorithm ) ); + json_object_set( _svc_acct, "irods_default_hash_scheme", json_string( my_env.rodsDefaultHashScheme ) ); + json_object_set( _svc_acct, "irods_match_hash_policy", json_string( my_env.rodsMatchHashPolicy ) ); return SUCCESS(); From e007d00a99f0e4e81be1178d2814cf19a6a4a010 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Wed, 29 Apr 2015 15:34:57 -0400 Subject: [PATCH 29/48] [#858] added tests to run_tests --- tests/pydevtest/run_tests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/pydevtest/run_tests.py b/tests/pydevtest/run_tests.py index b2fd540a68..3a2beebdbf 100644 --- a/tests/pydevtest/run_tests.py +++ b/tests/pydevtest/run_tests.py @@ -84,7 +84,9 @@ def startTest(self, test): test_identifiers.append(options.run_specific_test) if options.run_python_suite: test_identifiers.extend(['test_xmsg', 'iadmin_suite', 'test_mso_suite', 'test_resource_types', 'catalog_suite', 'rulebase_suite', - 'test_resource_tree', 'test_load_balanced_suite', 'test_icommands_file_operations', 'test_imeta_set', 'test_allrules', 'test_iscan', 'test_control_plane']) + 'test_resource_tree', 'test_load_balanced_suite', 'test_icommands_file_operations', 'test_imeta_set', + 'test_allrules', 'test_iscan', 'test_ichmod', 'test_iput_options', 'test_irsync', + 'test_control_plane']) if options.include_auth_suite_tests: test_identifiers.append('auth_suite') if options.include_fuse_suite_tests: From 9741812b807e7166d89b13ba4b156d06fc3d936d Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Wed, 29 Apr 2015 16:13:04 -0400 Subject: [PATCH 30/48] [#2628] DBUsername to db_username in server_config.py --- packaging/server_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/server_config.py b/packaging/server_config.py index a7eca16782..421d0112db 100644 --- a/packaging/server_config.py +++ b/packaging/server_config.py @@ -130,7 +130,7 @@ def exec_mysql_file(self, sql_filename): db_host = self.get('Server') db_port = self.get('Port') db_name = self.get('Database') - db_user = self.get('DBUsername') + db_user = self.get('db_username') db_pass = self.get_db_password() with tempfile.NamedTemporaryFile() as f: @@ -175,8 +175,8 @@ def exec_oracle_file(self, sql_filename): raise RuntimeError('Failed to find oracle binary. stdout[{0}] stderr[{1}]'.format(stdout, stderr)) sqlclient = stdout.strip().decode('utf-8').rstrip() db_port = self.get('Port') - db_user = self.get('DBUsername').split('@')[0] - db_host = self.get('DBUsername').split('@')[1] + db_user = self.get('db_username').split('@')[0] + db_host = self.get('db_username').split('@')[1] db_pass = self.get_db_password() run_str = '{sqlclient} {db_user}/{db_pass}@{db_host} < {sql_filename}'.format(**vars()) p = subprocess.Popen(run_str, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) From 2c74dbd3557314319a30ecd9700b8a97a6f5e859 Mon Sep 17 00:00:00 2001 From: Jason Coposky Date: Wed, 29 Apr 2015 16:07:20 -0400 Subject: [PATCH 31/48] [#2668] build plugin path from irods environment variable if available --- .gitignore | 6 +-- iRODS/lib/core/include/getRodsEnv.hpp | 4 ++ iRODS/lib/core/include/irods_api_home.hpp.src | 13 ----- .../lib/core/include/irods_auth_home.hpp.src | 13 ----- .../include/irods_configuration_keywords.hpp | 11 ++++ iRODS/lib/core/include/irods_load_plugin.hpp | 47 ++++++++++++++++ iRODS/lib/core/include/irods_ms_home.hpp.src | 13 ----- .../core/include/irods_network_home.hpp.src | 13 ----- .../irods_plugin_home_directory.hpp.src | 15 ++++++ .../core/include/irods_resources_home.hpp.src | 13 ----- iRODS/lib/core/src/apiHandler.cpp | 12 +++-- iRODS/lib/core/src/getRodsEnv.cpp | 11 ++++ iRODS/lib/core/src/irods_auth_plugin.cpp | 10 +++- iRODS/lib/core/src/irods_network_plugin.cpp | 21 +++++--- iRODS/lib/core/src/irods_resource_plugin.cpp | 20 ++++--- iRODS/server/api/src/rsClientHints.cpp | 6 --- iRODS/server/api/src/rsGeneralAdmin.cpp | 25 +++++++-- iRODS/server/api/src/rsServerReport.cpp | 40 +++++++------- .../core/include/irods_database_home.hpp.src | 13 ----- .../server/core/src/irods_database_plugin.cpp | 21 +++++--- iRODS/server/re/src/irods_ms_plugin.cpp | 10 +++- iRODS/server/re/src/nre.systemMS.cpp | 11 +++- packaging/build.sh | 54 +++---------------- 23 files changed, 215 insertions(+), 187 deletions(-) delete mode 100644 iRODS/lib/core/include/irods_api_home.hpp.src delete mode 100644 iRODS/lib/core/include/irods_auth_home.hpp.src delete mode 100644 iRODS/lib/core/include/irods_ms_home.hpp.src delete mode 100644 iRODS/lib/core/include/irods_network_home.hpp.src create mode 100644 iRODS/lib/core/include/irods_plugin_home_directory.hpp.src delete mode 100644 iRODS/lib/core/include/irods_resources_home.hpp.src delete mode 100644 iRODS/server/core/include/irods_database_home.hpp.src diff --git a/.gitignore b/.gitignore index 7b5c4fdb35..61e95897e1 100644 --- a/.gitignore +++ b/.gitignore @@ -24,12 +24,8 @@ iRODS/clients/c_api_test/mytest iRODS/config/config.mk iRODS/config/irods.config iRODS/config/platform.mk -iRODS/lib/core/include/irods_api_home.hpp -iRODS/lib/core/include/irods_auth_home.hpp +iRODS/lib/core/include/irods_plugin_home_directory.hpp iRODS/lib/core/include/irods_home_directory.hpp -iRODS/lib/core/include/irods_ms_home.hpp -iRODS/lib/core/include/irods_network_home.hpp -iRODS/lib/core/include/irods_resources_home.hpp iRODS/lib/core/include/server_control_plane_command.hpp iRODS/server/core/include/irods_database_home.hpp iRODS/lib/core/include/rodsVersion.hpp diff --git a/iRODS/lib/core/include/getRodsEnv.hpp b/iRODS/lib/core/include/getRodsEnv.hpp index 3ad40e4710..7bfb6af81f 100644 --- a/iRODS/lib/core/include/getRodsEnv.hpp +++ b/iRODS/lib/core/include/getRodsEnv.hpp @@ -59,6 +59,10 @@ typedef struct { int irodsMaxSizeForSingleBuffer; int irodsDefaultNumberTransferThreads; int irodsTransBufferSizeForParaTrans; + + // =-=-=-=-=-=-=- + // override of plugin installation directory + char irodsPluginHome[MAX_NAME_LEN]; } rodsEnv; diff --git a/iRODS/lib/core/include/irods_api_home.hpp.src b/iRODS/lib/core/include/irods_api_home.hpp.src deleted file mode 100644 index 68420109ba..0000000000 --- a/iRODS/lib/core/include/irods_api_home.hpp.src +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef __IRODS_API_HOME_HPP__ -#define __IRODS_API_HOME_HPP__ - -#include - -namespace irods { - - const std::string API_HOME( "IRODSAPIPATH" ); - -}; // namespace irods - -#endif // __IRODS_API_HOME_HPP__ diff --git a/iRODS/lib/core/include/irods_auth_home.hpp.src b/iRODS/lib/core/include/irods_auth_home.hpp.src deleted file mode 100644 index ca3da61239..0000000000 --- a/iRODS/lib/core/include/irods_auth_home.hpp.src +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef __IRODS_AUTH_HOME_HPP__ -#define __IRODS_AUTH_HOME_HPP__ - -#include - -namespace irods { - - const std::string AUTH_HOME( "IRODSAUTHPATH" ); - -}; // namespace irods - -#endif // __IRODS_AUTH_HOME_HPP__ diff --git a/iRODS/lib/core/include/irods_configuration_keywords.hpp b/iRODS/lib/core/include/irods_configuration_keywords.hpp index e79c5cce51..1106da3dc3 100644 --- a/iRODS/lib/core/include/irods_configuration_keywords.hpp +++ b/iRODS/lib/core/include/irods_configuration_keywords.hpp @@ -145,6 +145,17 @@ namespace irods { const std::string CFG_SERVER_CONTROL_PLANE_ENCRYPTION_ALGORITHM_KW( "server_control_plane_encryption_algorithm" ); + const std::string CFG_IRODS_PLUGIN_HOME_KW( "irods_plugin_home" ); + + // plugin types + const std::string PLUGIN_TYPE_API( "api" ); + const std::string PLUGIN_TYPE_AUTHENTICATION( "auth" ); + const std::string PLUGIN_TYPE_NETWORK( "network" ); + const std::string PLUGIN_TYPE_DATABASE( "database" ); + const std::string PLUGIN_TYPE_RESOURCE( "resources" ); + const std::string PLUGIN_TYPE_MICROSERVICE( "microservices" ); + + }; // namespace irods #endif // CONFIGURATION_KEYWORDS_HPP diff --git a/iRODS/lib/core/include/irods_load_plugin.hpp b/iRODS/lib/core/include/irods_load_plugin.hpp index cd36b7407f..fc849b9e8e 100644 --- a/iRODS/lib/core/include/irods_load_plugin.hpp +++ b/iRODS/lib/core/include/irods_load_plugin.hpp @@ -5,6 +5,8 @@ // My Includes #include "irods_log.hpp" #include "irods_plugin_name_generator.hpp" +#include "irods_plugin_home_directory.hpp" +#include "irods_configuration_keywords.hpp" // =-=-=-=-=-=-=- // STL Includes @@ -16,6 +18,7 @@ // =-=-=-=-=-=-=- // Boost Includes #include +#include // =-=-=-=-=-=-=- // dlopen, etc @@ -23,6 +26,50 @@ namespace irods { + static error resolve_plugin_path( + const std::string& _type, + std::string& _path ) { + namespace fs = boost::filesystem; + std::string plugin_home = PLUGIN_HOME; + + rodsEnv env; + int status = getRodsEnv( &env ); + if( !status ) { + // we'll allow it + } + + if( strlen( env.irodsPluginHome ) > 0 ) { + plugin_home = env.irodsPluginHome; + } + + plugin_home += _type; + + fs::path p = fs::canonical( plugin_home ); + if( !fs::exists( p ) ) { + std::string msg( "does not exist [" ); + msg += plugin_home; + msg += "]"; + return ERROR( + SYS_INVALID_INPUT_PARAM, + msg ); + + } + + if( fs::path::preferred_separator != *plugin_home.rbegin() ) { + plugin_home += fs::path::preferred_separator; + } + + _path = plugin_home; + + rodsLog( + LOG_DEBUG, + "resolved plugin home [%s]", + plugin_home.c_str() ); + + return SUCCESS(); + + } // resolve_plugin_path + // =-=-=-=-=-=-=- // machinery using SFINAE to determine if PluginType supports delay_load // yes / no types diff --git a/iRODS/lib/core/include/irods_ms_home.hpp.src b/iRODS/lib/core/include/irods_ms_home.hpp.src deleted file mode 100644 index ffa7a80e58..0000000000 --- a/iRODS/lib/core/include/irods_ms_home.hpp.src +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef __IRODS_MS_HOME_HPP__ -#define __IRODS_MS_HOME_HPP__ - -#include - -namespace irods { - - const std::string MS_HOME( "IRODSMSVCPATH" ); - -}; // namespace irods - -#endif // __IRODS_MS_HOME_HPP__ diff --git a/iRODS/lib/core/include/irods_network_home.hpp.src b/iRODS/lib/core/include/irods_network_home.hpp.src deleted file mode 100644 index 23a9cab567..0000000000 --- a/iRODS/lib/core/include/irods_network_home.hpp.src +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef __IRODS_NETWORK_HOME_HPP__ -#define __IRODS_NETWORK_HOME_HPP__ - -#include - -namespace irods { - - const std::string NETWORK_HOME( "IRODSNETWORKPATH" ); - -}; // namespace irods - -#endif // __IRODS_NETWORK_HOME_HPP__ diff --git a/iRODS/lib/core/include/irods_plugin_home_directory.hpp.src b/iRODS/lib/core/include/irods_plugin_home_directory.hpp.src new file mode 100644 index 0000000000..06f489d51d --- /dev/null +++ b/iRODS/lib/core/include/irods_plugin_home_directory.hpp.src @@ -0,0 +1,15 @@ + +#ifndef IRODS_PLUGIN_HOME_HPP +#define IRODS_PLUGIN_HOME_HPP + +#include + +namespace irods { + + const std::string PLUGIN_HOME( "IRODSPLUGINHOMEPATH" ); + +}; // namespace irods + +#endif // IRODS_PLUGIN_HOME_HPP + + diff --git a/iRODS/lib/core/include/irods_resources_home.hpp.src b/iRODS/lib/core/include/irods_resources_home.hpp.src deleted file mode 100644 index 83d72c9239..0000000000 --- a/iRODS/lib/core/include/irods_resources_home.hpp.src +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef __IRODS_RESOURCES_HOME_HPP__ -#define __IRODS_RESOURCES_HOME_HPP__ - -#include - -namespace irods { - - const std::string RESOURCES_HOME( "IRODSRESOURCESPATH" ); - -}; // namespace irods - -#endif // __IRODS_RESOURCES_HOME_HPP__ diff --git a/iRODS/lib/core/src/apiHandler.cpp b/iRODS/lib/core/src/apiHandler.cpp index 7fca9bd302..d9fa944e42 100644 --- a/iRODS/lib/core/src/apiHandler.cpp +++ b/iRODS/lib/core/src/apiHandler.cpp @@ -1,7 +1,6 @@ // =-=-=-=-=-=-=- // irods includes #include "apiHandler.hpp" -#include "irods_api_home.hpp" #include "irods_load_plugin.hpp" #include "irods_plugin_name_generator.hpp" #include "irods_pack_table.hpp" @@ -147,10 +146,17 @@ namespace irods { api_entry_table& _api_tbl, pack_entry_table& _pack_tbl, bool _cli_flg ) { + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + error ret = resolve_plugin_path( irods::PLUGIN_TYPE_API, plugin_home ); + if( !ret.ok() ) { + return PASS( ret ); + } // =-=-=-=-=-=-=- // iterate over the API_HOME directory entries - boost::filesystem::path so_dir( irods::API_HOME ); + boost::filesystem::path so_dir( plugin_home ); if ( boost::filesystem::exists( so_dir ) ) { for ( boost::filesystem::directory_iterator it( so_dir ); it != boost::filesystem::directory_iterator(); @@ -191,7 +197,7 @@ namespace irods { error ret = load_plugin< api_entry >( entry, name, - API_HOME, + plugin_home, "inst", "ctx" ); if ( ret.ok() && entry ) { // =-=-=-=-=-=-=- diff --git a/iRODS/lib/core/src/getRodsEnv.cpp b/iRODS/lib/core/src/getRodsEnv.cpp index 85a3ebc409..081906cf4f 100644 --- a/iRODS/lib/core/src/getRodsEnv.cpp +++ b/iRODS/lib/core/src/getRodsEnv.cpp @@ -461,6 +461,12 @@ extern "C" { irods::CFG_IRODS_TRANS_BUFFER_SIZE_FOR_PARA_TRANS, _env->irodsTransBufferSizeForParaTrans ); + capture_string_property( + msg_lvl, + props, + irods::CFG_IRODS_PLUGIN_HOME_KW, + _env->irodsPluginHome ); + return 0; } @@ -746,6 +752,11 @@ extern "C" { env_var, _env->irodsTransBufferSizeForParaTrans ); + env_var = irods::CFG_IRODS_PLUGIN_HOME_KW; + capture_string_env_var( + env_var, + _env->irodsPluginHome ); + return 0; } diff --git a/iRODS/lib/core/src/irods_auth_plugin.cpp b/iRODS/lib/core/src/irods_auth_plugin.cpp index 2756fc8e73..8b12ecf6ba 100644 --- a/iRODS/lib/core/src/irods_auth_plugin.cpp +++ b/iRODS/lib/core/src/irods_auth_plugin.cpp @@ -1,6 +1,5 @@ #include "irods_auth_plugin.hpp" #include "irods_load_plugin.hpp" -#include "irods_auth_home.hpp" namespace irods { @@ -131,11 +130,18 @@ namespace irods { const std::string& _inst_name, const std::string& _context ) { error result = SUCCESS(); + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + error ret = resolve_plugin_path( PLUGIN_TYPE_AUTHENTICATION, plugin_home ); + if( !ret.ok() ) { + return PASS( ret ); + } // =-=-=-=-=-=-=- // call generic plugin loader auth* ath = 0; - error ret = load_plugin< auth >( ath, _plugin_name, AUTH_HOME, _inst_name, _context ); + ret = load_plugin< auth >( ath, _plugin_name, plugin_home, _inst_name, _context ); if ( ( result = ASSERT_PASS( ret, "Failed to load plugin: \"%s\".", _plugin_name.c_str() ) ).ok() ) { if ( ( result = ASSERT_ERROR( ath, SYS_INVALID_INPUT_PARAM, "Invalid auth plugin." ) ).ok() ) { _plugin.reset( ath ); diff --git a/iRODS/lib/core/src/irods_network_plugin.cpp b/iRODS/lib/core/src/irods_network_plugin.cpp index 0b3a1d83b1..73fb708b18 100644 --- a/iRODS/lib/core/src/irods_network_plugin.cpp +++ b/iRODS/lib/core/src/irods_network_plugin.cpp @@ -2,7 +2,6 @@ // My Includes #include "irods_network_plugin.hpp" #include "irods_load_plugin.hpp" -#include "irods_network_home.hpp" #include "irods_stacktrace.hpp" #include "irods_operation_rule_execution_manager_base.hpp" @@ -218,15 +217,23 @@ namespace irods { const std::string& _plugin_name, const std::string& _inst_name, const std::string& _context ) { + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + error ret = resolve_plugin_path( PLUGIN_TYPE_NETWORK, plugin_home ); + if( !ret.ok() ) { + return PASS( ret ); + } + // =-=-=-=-=-=-=- // call generic plugin loader network* net = 0; - error ret = load_plugin< network >( - net, - _plugin_name, - NETWORK_HOME, - _inst_name, - _context ); + ret = load_plugin< network >( + net, + _plugin_name, + plugin_home, + _inst_name, + _context ); if ( ret.ok() && net ) { _plugin.reset( net ); return SUCCESS(); diff --git a/iRODS/lib/core/src/irods_resource_plugin.cpp b/iRODS/lib/core/src/irods_resource_plugin.cpp index fd7d369512..baeed66357 100644 --- a/iRODS/lib/core/src/irods_resource_plugin.cpp +++ b/iRODS/lib/core/src/irods_resource_plugin.cpp @@ -3,7 +3,6 @@ #include "irods_resource_plugin.hpp" #include "irods_resource_plugin_impostor.hpp" #include "irods_load_plugin.hpp" -#include "irods_resources_home.hpp" #include "irods_operation_rule_execution_manager_base.hpp" // =-=-=-=-=-=-=- @@ -275,14 +274,21 @@ namespace irods { const std::string _plugin_name, const std::string _inst_name, const std::string _context ) { + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + error ret = resolve_plugin_path( PLUGIN_TYPE_RESOURCE, plugin_home ); + if( !ret.ok() ) { + return PASS( ret ); + } resource* resc = 0; - error ret = load_plugin< resource >( - resc, - _plugin_name, - RESOURCES_HOME, - _inst_name, - _context ); + ret = load_plugin< resource >( + resc, + _plugin_name, + plugin_home, + _inst_name, + _context ); if ( ret.ok() && resc ) { _plugin.reset( resc ); diff --git a/iRODS/server/api/src/rsClientHints.cpp b/iRODS/server/api/src/rsClientHints.cpp index 7ef4f49646..7f9916ed01 100644 --- a/iRODS/server/api/src/rsClientHints.cpp +++ b/iRODS/server/api/src/rsClientHints.cpp @@ -2,12 +2,6 @@ #include "rsGlobalExtern.hpp" #include "rodsErrorTable.hpp" -#include "irods_ms_home.hpp" -#include "irods_network_home.hpp" -#include "irods_auth_home.hpp" -#include "irods_resources_home.hpp" -#include "irods_api_home.hpp" -#include "irods_database_home.hpp" #include "irods_lookup_table.hpp" #include "irods_server_properties.hpp" #include "irods_log.hpp" diff --git a/iRODS/server/api/src/rsGeneralAdmin.cpp b/iRODS/server/api/src/rsGeneralAdmin.cpp index 1166126ca5..1a67ac86df 100644 --- a/iRODS/server/api/src/rsGeneralAdmin.cpp +++ b/iRODS/server/api/src/rsGeneralAdmin.cpp @@ -20,10 +20,11 @@ #include "irods_children_parser.hpp" #include "irods_string_tokenize.hpp" #include "irods_plugin_name_generator.hpp" -#include "irods_resources_home.hpp" #include "irods_resource_manager.hpp" #include "irods_file_object.hpp" #include "irods_resource_constants.hpp" +#include "irods_load_plugin.hpp" + extern irods::resource_manager resc_mgr; @@ -213,7 +214,16 @@ _addResource( // =-=-=-=-=-=-=- // Check that there is a plugin matching the resource type irods::plugin_name_generator name_gen; - if ( !name_gen.exists( resc_input[irods::RESOURCE_TYPE], irods::RESOURCES_HOME ) ) { + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + irods::error ret = irods::resolve_plugin_path( irods::PLUGIN_TYPE_RESOURCE, plugin_home ); + if( !ret.ok() ) { + irods::log( PASS( ret ) ); + return ret.code(); + } + + if ( !name_gen.exists( resc_input[irods::RESOURCE_TYPE], plugin_home ) ) { rodsLog( LOG_DEBUG, "No plugin exists to provide resource [%s] of type [%s]", @@ -252,10 +262,19 @@ _addResource( int _listRescTypes( rsComm_t* _rsComm ) { + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + irods::error ret = irods::resolve_plugin_path( irods::PLUGIN_TYPE_RESOURCE, plugin_home ); + if( !ret.ok() ) { + irods::log( PASS( ret ) ); + return ret.code(); + } + int result = 0; irods::plugin_name_generator name_gen; irods::plugin_name_generator::plugin_list_t plugin_list; - irods::error ret = name_gen.list_plugins( irods::RESOURCES_HOME, plugin_list ); + ret = name_gen.list_plugins( plugin_home, plugin_list ); if ( ret.ok() ) { std::stringstream msg; for ( irods::plugin_name_generator::plugin_list_t::iterator it = plugin_list.begin(); diff --git a/iRODS/server/api/src/rsServerReport.cpp b/iRODS/server/api/src/rsServerReport.cpp index 98b0b632a4..1b3f31d9d9 100644 --- a/iRODS/server/api/src/rsServerReport.cpp +++ b/iRODS/server/api/src/rsServerReport.cpp @@ -3,24 +3,20 @@ #include "miscServerFunct.hpp" #include "reIn2p3SysRule.hpp" -#include "irods_ms_home.hpp" -#include "irods_network_home.hpp" -#include "irods_auth_home.hpp" -#include "irods_resources_home.hpp" -#include "irods_api_home.hpp" -#include "irods_database_home.hpp" #include "irods_lookup_table.hpp" #include "irods_log.hpp" #include "irods_plugin_name_generator.hpp" #include "irods_home_directory.hpp" +#include "irods_plugin_home_directory.hpp" #include "irods_resource_manager.hpp" #include "irods_get_full_path_for_config_file.hpp" #include "server_report.hpp" #include "readServerConfig.hpp" #include "irods_server_properties.hpp" #include "irods_environment_properties.hpp" +#include "irods_load_plugin.hpp" -#include +#include "jansson.h" #include #include @@ -543,13 +539,19 @@ irods::error convert_service_account( irods::error add_plugin_type_to_json_array( - const std::string& dir_name, - const char* plugin_type, - json_t*& json_array ) { + const std::string& _plugin_type, + const char* _type_name, + json_t*& _json_array ) { + + std::string plugin_home; + irods::error ret = irods::resolve_plugin_path( _plugin_type, plugin_home ); + if( !ret.ok() ) { + return PASS( ret ); + } irods::plugin_name_generator name_gen; irods::plugin_name_generator::plugin_list_t plugin_list; - irods::error ret = name_gen.list_plugins( dir_name, plugin_list ); + ret = name_gen.list_plugins( plugin_home, plugin_list ); if ( !ret.ok() ) { return PASS( ret ); } @@ -560,11 +562,11 @@ irods::error add_plugin_type_to_json_array( json_t* plug = json_object(); json_object_set( plug, "name", json_string( itr->c_str() ) ); - json_object_set( plug, "type", json_string( plugin_type ) ); + json_object_set( plug, "type", json_string( _type_name ) ); json_object_set( plug, "version", json_string( "" ) ); json_object_set( plug, "checksum_sha256", json_string( "" ) ); - json_array_append( json_array, plug ); + json_array_append( _json_array, plug ); } return SUCCESS(); @@ -580,32 +582,32 @@ irods::error get_plugin_array( "json_object() failed" ); } - irods::error ret = add_plugin_type_to_json_array( irods::RESOURCES_HOME, "resource", _plugins ); + irods::error ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_RESOURCE, "resource", _plugins ); if ( !ret.ok() ) { return PASS( ret ); } - ret = add_plugin_type_to_json_array( irods::IRODS_DATABASE_HOME, "database", _plugins ); + ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_DATABASE, "database", _plugins ); if ( !ret.ok() ) { return PASS( ret ); } - ret = add_plugin_type_to_json_array( irods::AUTH_HOME, "auth", _plugins ); + ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_AUTHENTICATION, "authentication", _plugins ); if ( !ret.ok() ) { return PASS( ret ); } - ret = add_plugin_type_to_json_array( irods::NETWORK_HOME, "network", _plugins ); + ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_NETWORK, "network", _plugins ); if ( !ret.ok() ) { return PASS( ret ); } - ret = add_plugin_type_to_json_array( irods::API_HOME, "api", _plugins ); + ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_API, "api", _plugins ); if ( !ret.ok() ) { return PASS( ret ); } - ret = add_plugin_type_to_json_array( irods::MS_HOME, "microservice", _plugins ); + ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_MICROSERVICE, "microservices", _plugins ); if ( !ret.ok() ) { return PASS( ret ); } diff --git a/iRODS/server/core/include/irods_database_home.hpp.src b/iRODS/server/core/include/irods_database_home.hpp.src deleted file mode 100644 index 0946dca2ea..0000000000 --- a/iRODS/server/core/include/irods_database_home.hpp.src +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef _IRODS_DATABASE_HOME_HPP_ -#define _IRODS_DATABASE_HOME_HPP_ - -#include - -namespace irods { - - const std::string IRODS_DATABASE_HOME( "IRODSDATABASEPATH" ); - -}; // namespace irods - -#endif // _IRODS_DATABASE_HOME_HPP_ diff --git a/iRODS/server/core/src/irods_database_plugin.cpp b/iRODS/server/core/src/irods_database_plugin.cpp index d019c534ff..7b86c04e62 100644 --- a/iRODS/server/core/src/irods_database_plugin.cpp +++ b/iRODS/server/core/src/irods_database_plugin.cpp @@ -2,7 +2,6 @@ // My Includes #include "irods_database_plugin.hpp" #include "irods_load_plugin.hpp" -#include "irods_database_home.hpp" #include "irods_stacktrace.hpp" #include "irods_operation_rule_execution_manager_base.hpp" @@ -219,15 +218,23 @@ namespace irods { const std::string& _plugin_name, const std::string& _inst_name, const std::string& _context ) { + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + error ret = resolve_plugin_path( PLUGIN_TYPE_DATABASE, plugin_home ); + if( !ret.ok() ) { + return PASS( ret ); + } + // =-=-=-=-=-=-=- // call generic plugin loader database* db = 0; - error ret = load_plugin< database >( - db, - _plugin_name, - IRODS_DATABASE_HOME, - _inst_name, - _context ); + ret = load_plugin< database >( + db, + _plugin_name, + plugin_home, + _inst_name, + _context ); if ( ret.ok() && db ) { _plugin.reset( db ); return SUCCESS(); diff --git a/iRODS/server/re/src/irods_ms_plugin.cpp b/iRODS/server/re/src/irods_ms_plugin.cpp index 9cf1d4e88b..b8f91240a2 100644 --- a/iRODS/server/re/src/irods_ms_plugin.cpp +++ b/iRODS/server/re/src/irods_ms_plugin.cpp @@ -1,6 +1,5 @@ // =-=-=-=-=-=-=- // My Includes -#include "irods_ms_home.hpp" #include "irods_ms_plugin.hpp" #include "irods_load_plugin.hpp" #include "irods_log.hpp" @@ -97,9 +96,16 @@ namespace irods { // given the name of a microservice, try to load the shared object // and then register that ms with the table error load_microservice_plugin( ms_table& _table, const std::string _ms ) { + // =-=-=-=-=-=-=- + // resolve plugin directory + std::string plugin_home; + error ret = resolve_plugin_path( PLUGIN_TYPE_MICROSERVICE, plugin_home ); + if( !ret.ok() ) { + return PASS( ret ); + } ms_table_entry* entry = 0; - error load_err = load_plugin< ms_table_entry >( entry, _ms, MS_HOME, "msvc", "ctx" ); + error load_err = load_plugin< ms_table_entry >( entry, _ms, plugin_home, "msvc", "ctx" ); if ( load_err.ok() && entry ) { _table[ _ms ] = entry; return SUCCESS(); diff --git a/iRODS/server/re/src/nre.systemMS.cpp b/iRODS/server/re/src/nre.systemMS.cpp index a233238e52..5c4548d23a 100644 --- a/iRODS/server/re/src/nre.systemMS.cpp +++ b/iRODS/server/re/src/nre.systemMS.cpp @@ -14,7 +14,7 @@ #include "rules.hpp" #include "conversion.hpp" #include "irods_plugin_name_generator.hpp" -#include "irods_ms_home.hpp" +#include "irods_load_plugin.hpp" #include "reFuncDefs.hpp" #include "sockComm.hpp" #include "irods_server_properties.hpp" @@ -1077,9 +1077,16 @@ msiListEnabledMS( // =-=-=-=-=-=-=- // scan plugin directory for additional plugins + std::string plugin_home; + irods::error ret = irods::resolve_plugin_path( irods::PLUGIN_TYPE_MICROSERVICE, plugin_home ); + if( !ret.ok() ) { + irods::log( PASS( ret ) ); + return ret.code(); + } + irods::plugin_name_generator name_gen; irods::plugin_name_generator::plugin_list_t plugin_list; - irods::error ret = name_gen.list_plugins( irods::MS_HOME, plugin_list ); + ret = name_gen.list_plugins( plugin_home, plugin_list ); if ( ret.ok() ) { irods::plugin_name_generator::plugin_list_t::iterator it = plugin_list.begin(); for ( ; it != plugin_list.end(); ++it ) { diff --git a/packaging/build.sh b/packaging/build.sh index 90ee266346..6aee3886bc 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -531,12 +531,7 @@ if [ "$1" == "clean" ] ; then rm -rf macosx-10.* rm -f iRODS/server/config/scriptMonPerf.config rm -f iRODS/lib/core/include/rodsVersion.hpp - rm -f iRODS/lib/core/include/irods_ms_home.hpp - rm -f iRODS/lib/core/include/irods_network_home.hpp - rm -f iRODS/lib/core/include/irods_auth_home.hpp - rm -f iRODS/lib/core/include/irods_api_home.hpp - rm -f iRODS/lib/core/include/irods_resources_home.hpp - rm -f iRODS/server/core/include/irods_database_home.hpp + rm -f iRODS/server/core/include/irods_plugin_home_directory.hpp rm -f iRODS/lib/core/include/irods_home_directory.hpp # database plugin cleanup ./plugins/database/build.sh clean @@ -1237,46 +1232,6 @@ if [ "$BUILDIRODS" == "1" ] ; then detected_irods_home=`./scripts/find_irods_home.sh` fi detected_irods_home=`dirname $detected_irods_home` - irods_msvc_home="$detected_irods_home/plugins/microservices/" - set_tmpfile - sed -e s,IRODSMSVCPATH,$irods_msvc_home, ./lib/core/include/irods_ms_home.hpp.src > $TMPFILE - rsync -c $TMPFILE ./lib/core/include/irods_ms_home.hpp - rm -f $TMPFILE - # =-=-=-=-=-=-=- - # modify the irods_network_home.hpp file with the proper path to the binary directory - irods_network_home="$detected_irods_home/plugins/network/" - set_tmpfile - sed -e s,IRODSNETWORKPATH,$irods_network_home, ./lib/core/include/irods_network_home.hpp.src > $TMPFILE - rsync -c $TMPFILE ./lib/core/include/irods_network_home.hpp - rm -f $TMPFILE - # =-=-=-=-=-=-=- - # modify the irods_auth_home.hpp file with the proper path to the binary directory - irods_auth_home="$detected_irods_home/plugins/auth/" - set_tmpfile - sed -e s,IRODSAUTHPATH,$irods_auth_home, ./lib/core/include/irods_auth_home.hpp.src > $TMPFILE - rsync -c $TMPFILE ./lib/core/include/irods_auth_home.hpp - rm -f $TMPFILE - # =-=-=-=-=-=-=- - # modify the irods_resources_home.hpp file with the proper path to the binary directory - irods_resources_home="$detected_irods_home/plugins/resources/" - set_tmpfile - sed -e s,IRODSRESOURCESPATH,$irods_resources_home, ./lib/core/include/irods_resources_home.hpp.src > $TMPFILE - rsync -c $TMPFILE ./lib/core/include/irods_resources_home.hpp - rm -f $TMPFILE - # =-=-=-=-=-=-=- - # modify the irods_database_home.hpp file with the proper path to the binary directory - irods_database_home="$detected_irods_home/plugins/database/" - set_tmpfile - sed -e s,IRODSDATABASEPATH,$irods_database_home, ./server/core/include/irods_database_home.hpp.src > $TMPFILE - rsync -c $TMPFILE ./server/core/include/irods_database_home.hpp - rm -f $TMPFILE - # =-=-=-=-=-=-=- - # modify the irods_api_home.hpp file with the proper path to the binary directory - irods_api_home="$detected_irods_home/plugins/api/" - set_tmpfile - sed -e s,IRODSAPIPATH,$irods_api_home, ./lib/core/include/irods_api_home.hpp.src > $TMPFILE - rsync -c $TMPFILE ./lib/core/include/irods_api_home.hpp - rm -f $TMPFILE # =-=-=-=-=-=-=- # modify the irods_home_directory.hpp file with the proper path to the home directory irods_home_directory="$detected_irods_home/" @@ -1284,6 +1239,13 @@ if [ "$BUILDIRODS" == "1" ] ; then sed -e s,IRODSHOMEDIRECTORY,$irods_home_directory, ./lib/core/include/irods_home_directory.hpp.src > $TMPFILE rsync -c $TMPFILE ./lib/core/include/irods_home_directory.hpp rm -f $TMPFILE + # =-=-=-=-=-=-=- + # modify the irods_plugin_home.hpp file with the proper path to the pluginhome directory + irods_plugin_home_directory="$detected_irods_home/plugins/" + set_tmpfile + sed -e s,IRODSPLUGINHOMEPATH,$irods_plugin_home_directory, ./lib/core/include/irods_plugin_home_directory.hpp.src > $TMPFILE + rsync -c $TMPFILE ./lib/core/include/irods_plugin_home_directory.hpp + rm -f $TMPFILE ########################################### # single 'make' time on an 8 core machine From b6059dd7bf7943968a3b1e11c75412b34d17fad8 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 16:35:02 -0400 Subject: [PATCH 32/48] [#858] izonereport now validates via test --- tests/pydevtest/catalog_suite.py | 26 ++++++++++++++++++++++++++ tests/pydevtest/lib.py | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/tests/pydevtest/catalog_suite.py b/tests/pydevtest/catalog_suite.py index 57771a2443..20df70d857 100644 --- a/tests/pydevtest/catalog_suite.py +++ b/tests/pydevtest/catalog_suite.py @@ -20,6 +20,32 @@ def setUp(self): def tearDown(self): super(Test_CatalogSuite, self).tearDown() + ################### + # izonereport + ################### + + def test_izonereport_and_validate(self): + # bad URL + self.admin.assert_icommand("izonereport > out.txt", use_unsafe_shell=True) + rc, out, err = lib.run_command('python ../../iRODS/scripts/python/validate_json.py out.txt https://example.org/badurl') + print "izonereport stdout: "+out + print "izonereport stderr: "+err + assert "WARNING: Validation Failed" in err, err + assert "ValueError: No JSON object could be decoded" in err, err + assert rc == 0, rc + + # good URL + self.admin.assert_icommand("izonereport > out.txt", use_unsafe_shell=True) + rc, out, err = lib.run_command('python ../../iRODS/scripts/python/validate_json.py out.txt https://schemas.irods.org/configuration/v2/zone_bundle.json') + print "izonereport stdout: "+out + print "izonereport stderr: "+err + assert "Validating" in out, out + assert "... Success" in out, out + assert rc == 0, rc + + # cleanup + os.remove('out.txt') + ################### # icd ################### diff --git a/tests/pydevtest/lib.py b/tests/pydevtest/lib.py index 00d34073bd..05690c55e7 100644 --- a/tests/pydevtest/lib.py +++ b/tests/pydevtest/lib.py @@ -468,7 +468,7 @@ def _log_run_icommand(self, arg): 'iqstat', 'ichksum', 'itrim', 'iphymv', 'ibun', 'iphybun', 'ireg', 'imcoll', 'irsync', 'ixmsg', 'irule', 'iqdel', 'iticket', 'iapitest', 'iscan', - 'isysmeta', 'iadmin', 'ifsck',] + 'isysmeta', 'iadmin', 'ifsck', 'izonereport'] if isinstance(arg, basestring): icommand = shlex.split(arg)[0] From 3cae323383de7513d8da9d717abece56db851906 Mon Sep 17 00:00:00 2001 From: Jason Coposky Date: Wed, 29 Apr 2015 16:34:28 -0400 Subject: [PATCH 33/48] [#858] clean up jansson includes --- iRODS/clients/icommands/src/iinit.cpp | 3 ++- iRODS/lib/core/include/irods_configuration_parser.hpp | 2 +- iRODS/server/api/src/rsClientHints.cpp | 2 +- iRODS/server/api/src/rsIESClientHints.cpp | 2 +- iRODS/server/api/src/rsServerReport.cpp | 2 +- iRODS/server/api/src/rsZoneReport.cpp | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/iRODS/clients/icommands/src/iinit.cpp b/iRODS/clients/icommands/src/iinit.cpp index 8a93958aa9..046e3c48ec 100644 --- a/iRODS/clients/icommands/src/iinit.cpp +++ b/iRODS/clients/icommands/src/iinit.cpp @@ -19,7 +19,8 @@ #include "boost/lexical_cast.hpp" -#include +#include "jansson.h" + #include #include diff --git a/iRODS/lib/core/include/irods_configuration_parser.hpp b/iRODS/lib/core/include/irods_configuration_parser.hpp index 0f5399ec3c..badb39064f 100644 --- a/iRODS/lib/core/include/irods_configuration_parser.hpp +++ b/iRODS/lib/core/include/irods_configuration_parser.hpp @@ -7,7 +7,7 @@ #include "irods_lookup_table.hpp" #include #include -#include +#include "jansson.h" namespace irods { diff --git a/iRODS/server/api/src/rsClientHints.cpp b/iRODS/server/api/src/rsClientHints.cpp index 7f9916ed01..50cbe1d7d0 100644 --- a/iRODS/server/api/src/rsClientHints.cpp +++ b/iRODS/server/api/src/rsClientHints.cpp @@ -12,7 +12,7 @@ #include "ies_client_hints.hpp" #include "readServerConfig.hpp" -#include +#include "jansson.h" #include #include diff --git a/iRODS/server/api/src/rsIESClientHints.cpp b/iRODS/server/api/src/rsIESClientHints.cpp index d29315b2b2..ee59db78ed 100644 --- a/iRODS/server/api/src/rsIESClientHints.cpp +++ b/iRODS/server/api/src/rsIESClientHints.cpp @@ -11,7 +11,7 @@ #include "irods_resource_backport.hpp" #include "irods_server_properties.hpp" -#include +#include "jansson.h" diff --git a/iRODS/server/api/src/rsServerReport.cpp b/iRODS/server/api/src/rsServerReport.cpp index 1b3f31d9d9..8934227c34 100644 --- a/iRODS/server/api/src/rsServerReport.cpp +++ b/iRODS/server/api/src/rsServerReport.cpp @@ -607,7 +607,7 @@ irods::error get_plugin_array( return PASS( ret ); } - ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_MICROSERVICE, "microservices", _plugins ); + ret = add_plugin_type_to_json_array( irods::PLUGIN_TYPE_MICROSERVICE, "microservice", _plugins ); if ( !ret.ok() ) { return PASS( ret ); } diff --git a/iRODS/server/api/src/rsZoneReport.cpp b/iRODS/server/api/src/rsZoneReport.cpp index dca3602a06..43ecf898f6 100644 --- a/iRODS/server/api/src/rsZoneReport.cpp +++ b/iRODS/server/api/src/rsZoneReport.cpp @@ -9,7 +9,7 @@ #include "irods_resource_manager.hpp" #include "irods_resource_backport.hpp" -#include +#include "jansson.h" From af2300e7a791eede3faf96b2faf17c7eba86df36 Mon Sep 17 00:00:00 2001 From: Jason Coposky Date: Wed, 29 Apr 2015 16:42:51 -0400 Subject: [PATCH 34/48] [#2668] build errors --- .gitignore | 1 - iRODS/server/test/src/test_cll.cpp | 1 - plugins/database/src/test_cll.cpp | 1 - 3 files changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 61e95897e1..021578fd7c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ iRODS/config/platform.mk iRODS/lib/core/include/irods_plugin_home_directory.hpp iRODS/lib/core/include/irods_home_directory.hpp iRODS/lib/core/include/server_control_plane_command.hpp -iRODS/server/core/include/irods_database_home.hpp iRODS/lib/core/include/rodsVersion.hpp iRODS/lib/core/src/rodsLog.cpp iRODS/server/config/server.config diff --git a/iRODS/server/test/src/test_cll.cpp b/iRODS/server/test/src/test_cll.cpp index 48587b4495..d3c5c06331 100644 --- a/iRODS/server/test/src/test_cll.cpp +++ b/iRODS/server/test/src/test_cll.cpp @@ -6,7 +6,6 @@ #include "rods.hpp" #include "readServerConfig.hpp" -#include "irods_database_home.hpp" #include "irods_plugin_name_generator.hpp" // =-=-=-=-=-=-=- diff --git a/plugins/database/src/test_cll.cpp b/plugins/database/src/test_cll.cpp index 7fe8325dfd..56fb5ab1f0 100644 --- a/plugins/database/src/test_cll.cpp +++ b/plugins/database/src/test_cll.cpp @@ -6,7 +6,6 @@ #include "rods.hpp" #include "readServerConfig.hpp" -#include "irods_database_home.hpp" #include "irods_plugin_name_generator.hpp" // =-=-=-=-=-=-=- From 343a6e66c446fade11d340485709a062262008b6 Mon Sep 17 00:00:00 2001 From: Jason Coposky Date: Wed, 29 Apr 2015 17:04:47 -0400 Subject: [PATCH 35/48] [2492] clean up client-side error messages --- iRODS/lib/core/src/getRodsEnv.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/iRODS/lib/core/src/getRodsEnv.cpp b/iRODS/lib/core/src/getRodsEnv.cpp index 081906cf4f..efb036d925 100644 --- a/iRODS/lib/core/src/getRodsEnv.cpp +++ b/iRODS/lib/core/src/getRodsEnv.cpp @@ -106,8 +106,6 @@ extern "C" { int getRodsEnv( rodsEnv *rodsEnvArg ) { if ( !rodsEnvArg ) { - printf( "ERROR - getRodsEnv :: null rodsEnv\n" ); - fflush( stdout ); return SYS_INVALID_INPUT_PARAM; } _getRodsEnv( *rodsEnvArg ); @@ -199,8 +197,6 @@ extern "C" { int getRodsEnvFromFile( rodsEnv* _env ) { if ( !_env ) { - printf( "ERROR - getRodsEnv :: null rodsEnv\n" ); - fflush( stdout ); return SYS_INVALID_INPUT_PARAM; } @@ -577,8 +573,6 @@ extern "C" { getRodsEnvFromEnv( rodsEnv* _env ) { if ( !_env ) { - printf( "ERROR - getRodsEnvFromEnv :: null rodsEnv\n" ); - fflush( stdout ); return SYS_INVALID_INPUT_PARAM; } From fe1e8668364d1dc1741ba8933753bcbc4869a89a Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Wed, 29 Apr 2015 17:07:18 -0400 Subject: [PATCH 36/48] [#858] Rename python tests for consistency --- tests/pydevtest/README | 2 +- tests/pydevtest/run_tests.py | 16 +-- .../{test_allrules.py => test_all_rules.py} | 0 .../pydevtest/{auth_suite.py => test_auth.py} | 6 +- .../{catalog_suite.py => test_catalog.py} | 12 +-- ...ibility_suite.py => test_compatibility.py} | 6 +- .../{test_fuse_suite.py => test_fuse.py} | 6 +- .../{iadmin_suite.py => test_iadmin.py} | 6 +- tests/pydevtest/test_resource_types.py | 102 +++++++++--------- .../{rulebase_suite.py => test_rulebase.py} | 6 +- .../{ticket_suite.py => test_ticket.py} | 6 +- tests/pydevtest/test_xmsg.py | 2 +- 12 files changed, 85 insertions(+), 85 deletions(-) rename tests/pydevtest/{test_allrules.py => test_all_rules.py} (100%) rename tests/pydevtest/{auth_suite.py => test_auth.py} (98%) rename tests/pydevtest/{catalog_suite.py => test_catalog.py} (96%) rename tests/pydevtest/{compatibility_suite.py => test_compatibility.py} (92%) rename tests/pydevtest/{test_fuse_suite.py => test_fuse.py} (97%) rename tests/pydevtest/{iadmin_suite.py => test_iadmin.py} (99%) rename tests/pydevtest/{rulebase_suite.py => test_rulebase.py} (96%) rename tests/pydevtest/{ticket_suite.py => test_ticket.py} (73%) diff --git a/tests/pydevtest/README b/tests/pydevtest/README index c1727a7518..52f6a6ee47 100644 --- a/tests/pydevtest/README +++ b/tests/pydevtest/README @@ -44,7 +44,7 @@ Run the test suite as irods The following command will run the entire test suite and take a few seconds for each test. This could take a couple hours to run on a relatively modern machine: - python run_tests.py --run_python_suite --include_auth_suite_tests --include_fuse_suite_tests --run_devtesty + python run_tests.py --run_python_suite --include_auth_tests --include_fuse_tests --run_devtesty The following command will run specific tests diff --git a/tests/pydevtest/run_tests.py b/tests/pydevtest/run_tests.py index 3a2beebdbf..745091c1b5 100644 --- a/tests/pydevtest/run_tests.py +++ b/tests/pydevtest/run_tests.py @@ -66,8 +66,8 @@ def startTest(self, test): parser = optparse.OptionParser() parser.add_option('--run_specific_test', metavar='dotted name') parser.add_option('--run_python_suite', action='store_true') - parser.add_option('--include_auth_suite_tests', action='store_true') - parser.add_option('--include_fuse_suite_tests', action='store_true') + parser.add_option('--include_auth_tests', action='store_true') + parser.add_option('--include_fuse_tests', action='store_true') parser.add_option('--run_devtesty', action='store_true') parser.add_option('--topology_test', type='choice', choices=['icat', 'resource'], action='callback', callback=optparse_callback_topology_test, metavar='') parser.add_option('--catch_keyboard_interrupt', action='callback', callback=optparse_callback_catch_keyboard_interrupt) @@ -83,14 +83,14 @@ def startTest(self, test): if options.run_specific_test: test_identifiers.append(options.run_specific_test) if options.run_python_suite: - test_identifiers.extend(['test_xmsg', 'iadmin_suite', 'test_mso_suite', 'test_resource_types', 'catalog_suite', 'rulebase_suite', + test_identifiers.extend(['test_xmsg', 'test_iadmin', 'test_mso_suite', 'test_resource_types', 'test_catalog', 'test_rulebase', 'test_resource_tree', 'test_load_balanced_suite', 'test_icommands_file_operations', 'test_imeta_set', - 'test_allrules', 'test_iscan', 'test_ichmod', 'test_iput_options', 'test_irsync', + 'test_all_rules', 'test_iscan', 'test_ichmod', 'test_iput_options', 'test_irsync', 'test_control_plane']) - if options.include_auth_suite_tests: - test_identifiers.append('auth_suite') - if options.include_fuse_suite_tests: - test_identifiers.append('test_fuse_suite') + if options.include_auth_tests: + test_identifiers.append('test_auth') + if options.include_fuse_tests: + test_identifiers.append('test_fuse') results = run_tests_from_names(test_identifiers, options.buffer_test_output) print(results) diff --git a/tests/pydevtest/test_allrules.py b/tests/pydevtest/test_all_rules.py similarity index 100% rename from tests/pydevtest/test_allrules.py rename to tests/pydevtest/test_all_rules.py diff --git a/tests/pydevtest/auth_suite.py b/tests/pydevtest/test_auth.py similarity index 98% rename from tests/pydevtest/auth_suite.py rename to tests/pydevtest/test_auth.py index 8007ad8a63..99ac553572 100644 --- a/tests/pydevtest/auth_suite.py +++ b/tests/pydevtest/test_auth.py @@ -48,14 +48,14 @@ def test_authentication_OSAuth(self): os.unlink(keyfile_path) # Requires existence of OS account 'irodsauthuser' with password 'iamnotasecret' -class Test_Auth_Suite(resource_suite.ResourceBase, unittest.TestCase): +class Test_Auth(resource_suite.ResourceBase, unittest.TestCase): def setUp(self): - super(Test_Auth_Suite, self).setUp() + super(Test_Auth, self).setUp() self.auth_session = lib.mkuser_and_return_session('rodsuser', 'irodsauthuser', 'iamnotasecret', lib.get_hostname()) def tearDown(self): - super(Test_Auth_Suite, self).tearDown() + super(Test_Auth, self).tearDown() self.auth_session.__exit__() lib.rmuser(self.auth_session.username) diff --git a/tests/pydevtest/catalog_suite.py b/tests/pydevtest/test_catalog.py similarity index 96% rename from tests/pydevtest/catalog_suite.py rename to tests/pydevtest/test_catalog.py index 20df70d857..ca7e95b51a 100644 --- a/tests/pydevtest/catalog_suite.py +++ b/tests/pydevtest/test_catalog.py @@ -13,12 +13,12 @@ import lib -class Test_CatalogSuite(ResourceBase, unittest.TestCase): +class Test_Catalog(ResourceBase, unittest.TestCase): def setUp(self): - super(Test_CatalogSuite, self).setUp() + super(Test_Catalog, self).setUp() def tearDown(self): - super(Test_CatalogSuite, self).tearDown() + super(Test_Catalog, self).tearDown() ################### # izonereport @@ -223,12 +223,12 @@ def get_future_time_string(t): -class Test_CatalogSuitePermissions(ResourceBase, unittest.TestCase): +class Test_CatalogPermissions(ResourceBase, unittest.TestCase): def setUp(self): - super(Test_CatalogSuitePermissions, self).setUp() + super(Test_CatalogPermissions, self).setUp() def tearDown(self): - super(Test_CatalogSuitePermissions, self).tearDown() + super(Test_CatalogPermissions, self).tearDown() def test_isysmeta_no_permission(self): self.user0.assert_icommand('icd /' + self.user0.zone_name + '/home/public') # get into public/ diff --git a/tests/pydevtest/compatibility_suite.py b/tests/pydevtest/test_compatibility.py similarity index 92% rename from tests/pydevtest/compatibility_suite.py rename to tests/pydevtest/test_compatibility.py index 6168fdcb59..8fea449740 100644 --- a/tests/pydevtest/compatibility_suite.py +++ b/tests/pydevtest/test_compatibility.py @@ -9,12 +9,12 @@ import lib -class Test_CompatibilitySuite(ResourceBase, unittest.TestCase): +class Test_Compatibility(ResourceBase, unittest.TestCase): def setUp(self): - super(Test_CompatibilitySuite, self).setUp() + super(Test_Compatibility, self).setUp() def tearDown(self): - super(Test_CompatibilitySuite, self).tearDown() + super(Test_Compatibility, self).tearDown() def test_imeta_set(self): self.admin.assert_icommand('iadmin lu', 'STDOUT_SINGLELINE', self.admin.username) diff --git a/tests/pydevtest/test_fuse_suite.py b/tests/pydevtest/test_fuse.py similarity index 97% rename from tests/pydevtest/test_fuse_suite.py rename to tests/pydevtest/test_fuse.py index eb33343122..df2cdcea43 100644 --- a/tests/pydevtest/test_fuse_suite.py +++ b/tests/pydevtest/test_fuse.py @@ -12,12 +12,12 @@ import socket -class Test_FuseSuite(ResourceBase, unittest.TestCase): +class Test_Fuse(ResourceBase, unittest.TestCase): def setUp(self): - super(Test_FuseSuite, self).setUp() + super(Test_Fuse, self).setUp() def tearDown(self): - super(Test_FuseSuite, self).tearDown() + super(Test_Fuse, self).tearDown() def test_irodsFs_issue_2252(self): # =-=-=-=-=-=-=- diff --git a/tests/pydevtest/iadmin_suite.py b/tests/pydevtest/test_iadmin.py similarity index 99% rename from tests/pydevtest/iadmin_suite.py rename to tests/pydevtest/test_iadmin.py index 28c94167eb..34f1c28542 100644 --- a/tests/pydevtest/iadmin_suite.py +++ b/tests/pydevtest/test_iadmin.py @@ -42,12 +42,12 @@ def write_host_access_control(filename, username, group, address, mask): with open(filename, 'w') as f: json.dump(hac, f, sort_keys=True, indent=4, ensure_ascii=False) -class Test_iAdminSuite(resource_suite.ResourceBase, unittest.TestCase): +class Test_Iadmin(resource_suite.ResourceBase, unittest.TestCase): def setUp(self): - super(Test_iAdminSuite, self).setUp() + super(Test_Iadmin, self).setUp() def tearDown(self): - super(Test_iAdminSuite, self).tearDown() + super(Test_Iadmin, self).tearDown() def test_api_plugin(self): self.admin.assert_icommand("iapitest", 'STDOUT_SINGLELINE', 'this') diff --git a/tests/pydevtest/test_resource_types.py b/tests/pydevtest/test_resource_types.py index a1df44e4bc..0b25f0f4fe 100644 --- a/tests/pydevtest/test_resource_types.py +++ b/tests/pydevtest/test_resource_types.py @@ -17,7 +17,7 @@ from test_chunkydevtest import ChunkyDevTest -class Test_Random_within_Replication_Resource(ResourceSuite, ChunkyDevTest, unittest.TestCase): +class Test_Resource_RandomWithinReplication(ResourceSuite, ChunkyDevTest, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -30,10 +30,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc demoResc unixA") admin_session.assert_icommand("iadmin addchildtoresc rrResc unixB1") admin_session.assert_icommand("iadmin addchildtoresc rrResc unixB2") - super(Test_Random_within_Replication_Resource, self).setUp() + super(Test_Resource_RandomWithinReplication, self).setUp() def tearDown(self): - super(Test_Random_within_Replication_Resource, self).tearDown() + super(Test_Resource_RandomWithinReplication, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc rrResc unixB2") admin_session.assert_icommand("iadmin rmchildfromresc rrResc unixB1") @@ -312,7 +312,7 @@ def test_local_iput_with_force_and_destination_resource__ticket_1706(self): os.remove(doublefile) -class Test_RoundRobin_within_Replication_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_RoundRobinWithinReplication(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -325,10 +325,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc demoResc unixA") admin_session.assert_icommand("iadmin addchildtoresc rrResc unixB1") admin_session.assert_icommand("iadmin addchildtoresc rrResc unixB2") - super(Test_RoundRobin_within_Replication_Resource, self).setUp() + super(Test_Resource_RoundRobinWithinReplication, self).setUp() def tearDown(self): - super(Test_RoundRobin_within_Replication_Resource, self).tearDown() + super(Test_Resource_RoundRobinWithinReplication, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc rrResc unixB2") admin_session.assert_icommand("iadmin rmchildfromresc rrResc unixB1") @@ -607,16 +607,16 @@ def test_local_iput_with_force_and_destination_resource__ticket_1706(self): os.remove(doublefile) -class Test_UnixFileSystem_Resource(ResourceSuite, ChunkyDevTest, unittest.TestCase): +class Test_Resource_Unixfilesystem(ResourceSuite, ChunkyDevTest, unittest.TestCase): def setUp(self): hostname = lib.get_hostname() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') admin_session.assert_icommand("iadmin mkresc demoResc 'unixfilesystem' " + hostname + ":" + lib.get_irods_top_level_dir() + "/demoRescVault", 'STDOUT_SINGLELINE', 'unixfilesystem') - super(Test_UnixFileSystem_Resource, self).setUp() + super(Test_Resource_Unixfilesystem, self).setUp() def tearDown(self): - super(Test_UnixFileSystem_Resource, self).tearDown() + super(Test_Resource_Unixfilesystem, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmresc demoResc") admin_session.assert_icommand("iadmin modresc origResc name demoResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -678,17 +678,17 @@ def test_ifsck__2650(self): os.remove(filepath) os.remove(filepath2) -class Test_Passthru_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_Passthru(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') admin_session.assert_icommand("iadmin mkresc demoResc passthru", 'STDOUT_SINGLELINE', 'passthru') admin_session.assert_icommand("iadmin mkresc unix1Resc 'unixfilesystem' " + configuration.HOSTNAME_1 + ":" + lib.get_irods_top_level_dir() + "/unix1RescVault", 'STDOUT_SINGLELINE', 'unixfilesystem') admin_session.assert_icommand("iadmin addchildtoresc demoResc unix1Resc") - super(Test_Passthru_Resource, self).setUp() + super(Test_Resource_Passthru, self).setUp() def tearDown(self): - super(Test_Passthru_Resource, self).tearDown() + super(Test_Resource_Passthru, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix1Resc") admin_session.assert_icommand("iadmin rmresc unix1Resc") @@ -700,7 +700,7 @@ def tearDown(self): def test_ireg_as_rodsuser_in_vault(self): pass -class Test_WeightedPassthru_Resource(ResourceBase, unittest.TestCase): +class Test_Resource_WeightedPassthru(ResourceBase, unittest.TestCase): def setUp(self): hostname = lib.get_hostname() with lib.make_session_for_existing_admin() as admin_session: @@ -712,10 +712,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc demoResc unixA") admin_session.assert_icommand("iadmin addchildtoresc demoResc w_pt") admin_session.assert_icommand("iadmin addchildtoresc w_pt unixB") - super(Test_WeightedPassthru_Resource, self).setUp() + super(Test_Resource_WeightedPassthru, self).setUp() def tearDown(self): - super(Test_WeightedPassthru_Resource, self).tearDown() + super(Test_Resource_WeightedPassthru, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc w_pt unixB") admin_session.assert_icommand("iadmin rmchildfromresc demoResc w_pt") @@ -745,17 +745,17 @@ def test_weighted_passthrough(self): self.admin.assert_icommand("iadmin modresc w_pt context 'write=1.0;read=0.01'") self.admin.assert_icommand("iget " + filename + " - ", 'STDOUT_SINGLELINE', "TESTFILE" ) -class Test_Deferred_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_Deferred(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') admin_session.assert_icommand("iadmin mkresc demoResc deferred", 'STDOUT_SINGLELINE', 'deferred') admin_session.assert_icommand("iadmin mkresc unix1Resc 'unixfilesystem' " + configuration.HOSTNAME_1 + ":" + lib.get_irods_top_level_dir() + "/unix1RescVault", 'STDOUT_SINGLELINE', 'unixfilesystem') admin_session.assert_icommand("iadmin addchildtoresc demoResc unix1Resc") - super(Test_Deferred_Resource, self).setUp() + super(Test_Resource_Deferred, self).setUp() def tearDown(self): - super(Test_Deferred_Resource, self).tearDown() + super(Test_Resource_Deferred, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix1Resc") admin_session.assert_icommand("iadmin rmresc unix1Resc") @@ -767,7 +767,7 @@ def tearDown(self): def test_ireg_as_rodsuser_in_vault(self): pass -class Test_Random_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_Random(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -778,10 +778,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc demoResc unix1Resc") admin_session.assert_icommand("iadmin addchildtoresc demoResc unix2Resc") admin_session.assert_icommand("iadmin addchildtoresc demoResc unix3Resc") - super(Test_Random_Resource, self).setUp() + super(Test_Resource_Random, self).setUp() def tearDown(self): - super(Test_Random_Resource, self).tearDown() + super(Test_Resource_Random, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix3Resc") admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix2Resc") @@ -800,21 +800,21 @@ def test_ireg_as_rodsuser_in_vault(self): pass -class Test_NonBlocking_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_NonBlocking(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') admin_session.assert_icommand("iadmin mkresc demoResc nonblocking " + configuration.HOSTNAME_1 + ":" + lib.get_irods_top_level_dir() + "/nbVault", 'STDOUT_SINGLELINE', 'nonblocking') - super(Test_NonBlocking_Resource, self).setUp() + super(Test_Resource_NonBlocking, self).setUp() def tearDown(self): - super(Test_NonBlocking_Resource, self).tearDown() + super(Test_Resource_NonBlocking, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmresc demoResc") admin_session.assert_icommand("iadmin modresc origResc name demoResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') -class Test_Compound_with_MockArchive_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_CompoundWithMockarchive(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -823,10 +823,10 @@ def setUp(self): admin_session.assert_icommand("iadmin mkresc archiveResc mockarchive " + configuration.HOSTNAME_1 + ":" + lib.get_irods_top_level_dir() + "/archiveRescVault univMSSInterface.sh", 'STDOUT_SINGLELINE', 'mockarchive') admin_session.assert_icommand("iadmin addchildtoresc demoResc cacheResc cache") admin_session.assert_icommand("iadmin addchildtoresc demoResc archiveResc archive") - super(Test_Compound_with_MockArchive_Resource, self).setUp() + super(Test_Resource_CompoundWithMockarchive, self).setUp() def tearDown(self): - super(Test_Compound_with_MockArchive_Resource, self).tearDown() + super(Test_Resource_CompoundWithMockarchive, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc archiveResc") admin_session.assert_icommand("iadmin rmchildfromresc demoResc cacheResc") @@ -1114,7 +1114,7 @@ def test_irepl_with_purgec(self): output = commands.getstatusoutput('rm ' + filepath) -class Test_Compound_with_UniversalMSS_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_CompoundWithUnivmss(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -1123,10 +1123,10 @@ def setUp(self): admin_session.assert_icommand("iadmin mkresc archiveResc univmss " + configuration.HOSTNAME_1 + ":" + lib.get_irods_top_level_dir() + "/archiveRescVault univMSSInterface.sh", 'STDOUT_SINGLELINE', 'univmss') admin_session.assert_icommand("iadmin addchildtoresc demoResc cacheResc cache") admin_session.assert_icommand("iadmin addchildtoresc demoResc archiveResc archive") - super(Test_Compound_with_UniversalMSS_Resource, self).setUp() + super(Test_Resource_CompoundWithUnivmss, self).setUp() def tearDown(self): - super(Test_Compound_with_UniversalMSS_Resource, self).tearDown() + super(Test_Resource_CompoundWithUnivmss, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc archiveResc") admin_session.assert_icommand("iadmin rmchildfromresc demoResc cacheResc") @@ -1410,7 +1410,7 @@ def test_irepl_with_purgec(self): output = commands.getstatusoutput('rm ' + filepath) -class Test_Compound_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_Compound(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -1419,10 +1419,10 @@ def setUp(self): admin_session.assert_icommand("iadmin mkresc archiveResc 'unixfilesystem' " + configuration.HOSTNAME_1 + ":" + lib.get_irods_top_level_dir() + "/archiveRescVault", 'STDOUT_SINGLELINE', 'unixfilesystem') admin_session.assert_icommand("iadmin addchildtoresc demoResc cacheResc cache") admin_session.assert_icommand("iadmin addchildtoresc demoResc archiveResc archive") - super(Test_Compound_Resource, self).setUp() + super(Test_Resource_Compound, self).setUp() def tearDown(self): - super(Test_Compound_Resource, self).tearDown() + super(Test_Resource_Compound, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc archiveResc") admin_session.assert_icommand("iadmin rmchildfromresc demoResc cacheResc") @@ -1770,7 +1770,7 @@ def test_irepl_with_purgec(self): output = commands.getstatusoutput('rm ' + filepath) -class Test_Replication_within_Replication_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_ReplicationWithinReplication(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -1783,10 +1783,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc demoResc unixA") admin_session.assert_icommand("iadmin addchildtoresc replResc unixB1") admin_session.assert_icommand("iadmin addchildtoresc replResc unixB2") - super(Test_Replication_within_Replication_Resource, self).setUp() + super(Test_Resource_ReplicationWithinReplication, self).setUp() def tearDown(self): - super(Test_Replication_within_Replication_Resource, self).tearDown() + super(Test_Resource_ReplicationWithinReplication, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc replResc unixB2") admin_session.assert_icommand("iadmin rmchildfromresc replResc unixB1") @@ -2078,7 +2078,7 @@ def test_local_iput_with_force_and_destination_resource__ticket_1706(self): os.remove(doublefile) -class Test_Replication_to_two_Compound_Resources(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_ReplicationToTwoCompound(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -2095,10 +2095,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc compResc1 archiveResc1 archive") admin_session.assert_icommand("iadmin addchildtoresc compResc2 cacheResc2 cache") admin_session.assert_icommand("iadmin addchildtoresc compResc2 archiveResc2 archive") - super(Test_Replication_to_two_Compound_Resources, self).setUp() + super(Test_Resource_ReplicationToTwoCompound, self).setUp() def tearDown(self): - super(Test_Replication_to_two_Compound_Resources, self).tearDown() + super(Test_Resource_ReplicationToTwoCompound, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc compResc2 archiveResc2") admin_session.assert_icommand("iadmin rmchildfromresc compResc2 cacheResc2") @@ -2518,7 +2518,7 @@ def test_irepl_with_purgec(self): # local cleanup output = commands.getstatusoutput('rm ' + filepath) -class Test_Replication_to_two_Compound_Resources_with_Prefer_Archive(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_ReplicationToTwoCompoundResourcesWithPreferArchive(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): # back up core file corefile = lib.get_irods_config_dir() + "/core.re" @@ -2544,10 +2544,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc compResc1 archiveResc1 archive") admin_session.assert_icommand("iadmin addchildtoresc compResc2 cacheResc2 cache") admin_session.assert_icommand("iadmin addchildtoresc compResc2 archiveResc2 archive") - super(Test_Replication_to_two_Compound_Resources_with_Prefer_Archive, self).setUp() + super(Test_Resource_ReplicationToTwoCompoundResourcesWithPreferArchive, self).setUp() def tearDown(self): - super(Test_Replication_to_two_Compound_Resources_with_Prefer_Archive, self).tearDown() + super(Test_Resource_ReplicationToTwoCompoundResourcesWithPreferArchive, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc compResc2 archiveResc2") admin_session.assert_icommand("iadmin rmchildfromresc compResc2 cacheResc2") @@ -2889,7 +2889,7 @@ def test_irepl_with_purgec(self): output = commands.getstatusoutput('rm ' + filepath) -class Test_RoundRobin_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_RoundRobin(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -2898,10 +2898,10 @@ def setUp(self): admin_session.assert_icommand("iadmin mkresc unix2Resc 'unixfilesystem' " + configuration.HOSTNAME_2 + ":" + lib.get_irods_top_level_dir() + "/unix2RescVault", 'STDOUT_SINGLELINE', 'unixfilesystem') admin_session.assert_icommand("iadmin addchildtoresc demoResc unix1Resc") admin_session.assert_icommand("iadmin addchildtoresc demoResc unix2Resc") - super(Test_RoundRobin_Resource, self).setUp() + super(Test_Resource_RoundRobin, self).setUp() def tearDown(self): - super(Test_RoundRobin_Resource, self).tearDown() + super(Test_Resource_RoundRobin, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix2Resc") admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix1Resc") @@ -2933,7 +2933,7 @@ def test_round_robin_mechanism(self): output = commands.getstatusoutput('rm ' + filepath) -class Test_Replication_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_Replication(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -2944,10 +2944,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc demoResc unix1Resc") admin_session.assert_icommand("iadmin addchildtoresc demoResc unix2Resc") admin_session.assert_icommand("iadmin addchildtoresc demoResc unix3Resc") - super(Test_Replication_Resource, self).setUp() + super(Test_Resource_Replication, self).setUp() def tearDown(self): - super(Test_Replication_Resource, self).tearDown() + super(Test_Resource_Replication, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix3Resc") admin_session.assert_icommand("iadmin rmchildfromresc demoResc unix2Resc") @@ -3267,7 +3267,7 @@ def test_irepl_with_purgec(self): output = commands.getstatusoutput('rm ' + filepath) -class Test_MultiLayered_Resource(ChunkyDevTest, ResourceSuite, unittest.TestCase): +class Test_Resource_MultiLayered(ChunkyDevTest, ResourceSuite, unittest.TestCase): def setUp(self): with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin modresc demoResc name origResc", 'STDOUT_SINGLELINE', 'rename', stdin_string='yes\n') @@ -3282,10 +3282,10 @@ def setUp(self): admin_session.assert_icommand("iadmin addchildtoresc rrResc unix1Resc") admin_session.assert_icommand("iadmin addchildtoresc rrResc unix2Resc") admin_session.assert_icommand("iadmin addchildtoresc rrResc unix3Resc") - super(Test_MultiLayered_Resource, self).setUp() + super(Test_Resource_MultiLayered, self).setUp() def tearDown(self): - super(Test_MultiLayered_Resource, self).tearDown() + super(Test_Resource_MultiLayered, self).tearDown() with lib.make_session_for_existing_admin() as admin_session: admin_session.assert_icommand("iadmin rmchildfromresc rrResc unix3Resc") admin_session.assert_icommand("iadmin rmchildfromresc rrResc unix2Resc") diff --git a/tests/pydevtest/rulebase_suite.py b/tests/pydevtest/test_rulebase.py similarity index 96% rename from tests/pydevtest/rulebase_suite.py rename to tests/pydevtest/test_rulebase.py index 03b7de50b2..8bc193f46a 100644 --- a/tests/pydevtest/rulebase_suite.py +++ b/tests/pydevtest/test_rulebase.py @@ -10,12 +10,12 @@ from resource_suite import ResourceBase -class Test_RulebaseSuite(ResourceBase, unittest.TestCase): +class Test_Rulebase(ResourceBase, unittest.TestCase): def setUp(self): - super(Test_RulebaseSuite, self).setUp() + super(Test_Rulebase, self).setUp() def tearDown(self): - super(Test_RulebaseSuite, self).tearDown() + super(Test_Rulebase, self).tearDown() def test_acPostProcForPut_replicate_to_multiple_resources(self): # create new resources diff --git a/tests/pydevtest/ticket_suite.py b/tests/pydevtest/test_ticket.py similarity index 73% rename from tests/pydevtest/ticket_suite.py rename to tests/pydevtest/test_ticket.py index 6f23675093..80c9499008 100644 --- a/tests/pydevtest/ticket_suite.py +++ b/tests/pydevtest/test_ticket.py @@ -6,12 +6,12 @@ from resource_suite import ResourceBase -class Test_TicketSuite(ResourceBase, unittest.TestCase): +class Test_Ticket(ResourceBase, unittest.TestCase): def setUp(self): - super(Test_TicketSuite, self).setUp() + super(Test_Ticket, self).setUp() def tearDown(self): - super(Test_TicketSuite, self).tearDown() + super(Test_Ticket, self).tearDown() def test_list_no_tickets(self): self.admin.assert_icommand('iticket ls') diff --git a/tests/pydevtest/test_xmsg.py b/tests/pydevtest/test_xmsg.py index 2677ea4c0c..393111c0b5 100644 --- a/tests/pydevtest/test_xmsg.py +++ b/tests/pydevtest/test_xmsg.py @@ -12,7 +12,7 @@ import lib -class Test_ixmsg(unittest.TestCase): +class Test_Xmsg(unittest.TestCase): serverConfigFile = lib.get_irods_config_dir() + '/server_config.json' serverConfigFileBackup = serverConfigFile + '_orig' xmsgHost = 'localhost' From 02b64a4e6c807c4c6dfe23fb916892fd22480a23 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Wed, 29 Apr 2015 17:29:55 -0400 Subject: [PATCH 37/48] [#2648] protect irods::error in miscServerFunct in ifdef --- iRODS/lib/api/include/dataObjOpen.hpp | 3 - .../core/include/sockCommNetworkInterface.hpp | 1 + iRODS/lib/core/src/sockComm.cpp | 1 + iRODS/server/api/src/rsPamAuthRequest.cpp | 1 + iRODS/server/core/include/miscServerFunct.hpp | 18 ++++-- iRODS/server/core/include/rodsConnect.h | 8 +++ iRODS/server/core/src/miscServerFunct.cpp | 63 ++++++++----------- iRODS/server/core/src/rodsServer.cpp | 29 ++++----- iRODS/server/core/src/xmsgLib.cpp | 12 ++-- 9 files changed, 66 insertions(+), 70 deletions(-) diff --git a/iRODS/lib/api/include/dataObjOpen.hpp b/iRODS/lib/api/include/dataObjOpen.hpp index 22d7c0632f..3c92702b61 100644 --- a/iRODS/lib/api/include/dataObjOpen.hpp +++ b/iRODS/lib/api/include/dataObjOpen.hpp @@ -51,9 +51,6 @@ procDataObjOpenForWrite( rsComm_t *rsComm, dataObjInp_t *dataObjInp, dataObjInfo_t **dataObjInfoHead, dataObjInfo_t **compDataObjInfo ); -// JMC :: unused -- irods::error selectObjInfo( dataObjInfo_t * _dataObjInfoHead, keyValPair_t* _condInput, dataObjInfo_t** _rtn_dataObjInfo ); - -// =-=-=-=-=-=-=- #else #define RS_DATA_OBJ_OPEN NULL #endif diff --git a/iRODS/lib/core/include/sockCommNetworkInterface.hpp b/iRODS/lib/core/include/sockCommNetworkInterface.hpp index 911b1df7fe..51d3e2a580 100644 --- a/iRODS/lib/core/include/sockCommNetworkInterface.hpp +++ b/iRODS/lib/core/include/sockCommNetworkInterface.hpp @@ -8,6 +8,7 @@ // =-=-=-=-=-=-=- // network plugin interface functions + irods::error readMsgHeader( irods::network_object_ptr, // network object msgHeader_t*, // header diff --git a/iRODS/lib/core/src/sockComm.cpp b/iRODS/lib/core/src/sockComm.cpp index b436b0296c..6debf30358 100644 --- a/iRODS/lib/core/src/sockComm.cpp +++ b/iRODS/lib/core/src/sockComm.cpp @@ -11,6 +11,7 @@ #include "getHostForGet.hpp" #include "QUANTAnet_rbudpBase_c.hpp" #include "rcConnect.hpp" +#include "rodsConnect.h" #ifdef windows_platform #include "irodsntutil.hpp" diff --git a/iRODS/server/api/src/rsPamAuthRequest.cpp b/iRODS/server/api/src/rsPamAuthRequest.cpp index 54e45e885d..b7b3f13aa1 100644 --- a/iRODS/server/api/src/rsPamAuthRequest.cpp +++ b/iRODS/server/api/src/rsPamAuthRequest.cpp @@ -12,6 +12,7 @@ #include "miscServerFunct.hpp" #include "irods_server_properties.hpp" #include "readServerConfig.hpp" +#include "irods_log.hpp" int diff --git a/iRODS/server/core/include/miscServerFunct.hpp b/iRODS/server/core/include/miscServerFunct.hpp index 64225ffdd1..695715876f 100644 --- a/iRODS/server/core/include/miscServerFunct.hpp +++ b/iRODS/server/core/include/miscServerFunct.hpp @@ -25,8 +25,6 @@ #include "structFileSync.hpp" /* JMC */ -#include "irods_network_object.hpp" - #define MAX_RECON_ERROR_CNT 10 typedef struct PortalTransferInp { @@ -125,9 +123,6 @@ forkAndExec( char *av[] ); int setupSrvPortalForParaOpr( rsComm_t *rsComm, dataOprInp_t *dataOprInp, int oprType, portalOprOut_t **portalOprOut ); -int -readStartupPack( irods::network_object_ptr, startupPack_t **startupPack, struct timeval *tv ); - int initServiceUser(); int @@ -143,9 +138,19 @@ dropRootPrivilege(); int checkModArgType( char *arg ); +#ifdef __cplusplus +#include "irods_error.hpp" +#include "irods_plugin_base.hpp" +#include "irods_network_object.hpp" + +irods::error readStartupPack( + irods::network_object_ptr, + startupPack_t **startupPack, + struct timeval *tv ); + irods::error get_current_resource_object_count( rsComm_t*, // comm handle - const std::string&, // resourc name + const std::string&, // resource name int& ); // out var - count irods::error update_resource_object_count( @@ -162,6 +167,7 @@ irods::error get_script_output_single_line( irods::error add_global_re_params_to_kvp_for_dynpep( keyValPair_t& _kvp ); +#endif // __cplusplus #endif /* MISC_SERVER_FUNCT_H */ diff --git a/iRODS/server/core/include/rodsConnect.h b/iRODS/server/core/include/rodsConnect.h index d6c0b6a6d5..4d06c0d947 100644 --- a/iRODS/server/core/include/rodsConnect.h +++ b/iRODS/server/core/include/rodsConnect.h @@ -108,6 +108,10 @@ typedef struct zoneInfo { #define REMOTE_ZONE_SID_KW "RemoteZoneSID" #define SID_KEY_KW "SIDKey" +#ifdef __cplusplus +extern "C" { +#endif + int queAddr( rodsServerHost_t *rodsServerHost, char *myHostName ); int @@ -188,4 +192,8 @@ printZoneInfo(); char * getConfigDir(); +#ifdef __cplusplus +} //extern C +#endif + #endif /* RODS_CONNECT_H */ diff --git a/iRODS/server/core/src/miscServerFunct.cpp b/iRODS/server/core/src/miscServerFunct.cpp index d92bd82658..7aa7ab7711 100644 --- a/iRODS/server/core/src/miscServerFunct.cpp +++ b/iRODS/server/core/src/miscServerFunct.cpp @@ -2705,13 +2705,11 @@ singleL1Copy( rsComm_t *rsComm, dataCopyInp_t *dataCopyInp ) { } } - - /* readStartupPack - Read the startup packet from client. * Note: initServerInfo must be called first because it calls getLocalZoneInfo. */ -int +irods::error readStartupPack( irods::network_object_ptr _ptr, startupPack_t** startupPack, @@ -2721,16 +2719,14 @@ readStartupPack( bytesBuf_t inputStructBBuf, bsBBuf, errorBBuf; irods::error ret = readMsgHeader( _ptr, &myHeader, tv ); if ( !ret.ok() ) { - irods::log( PASS( ret ) ); - return ret.code(); + return PASS( ret ); } if ( myHeader.msgLen > ( int ) sizeof( startupPack_t ) * 2 || myHeader.msgLen <= 0 ) { - rodsLog( LOG_NOTICE, - "readStartupPack: problem with myHeader.msgLen = %d", - myHeader.msgLen ); - return SYS_HEADER_READ_LEN_ERR; + std::stringstream msg; + msg << "readStartupPack: problem with myHeader.msgLen = " << myHeader.msgLen; + return ERROR( SYS_HEADER_READ_LEN_ERR, msg.str() ); } memset( &bsBBuf, 0, sizeof( bytesBuf_t ) ); @@ -2743,8 +2739,7 @@ readStartupPack( XML_PROT, tv ); if ( !ret.ok() ) { - irods::log( PASS( ret ) ); - return ret.code(); + return PASS( ret ); } /* some sanity check */ @@ -2759,10 +2754,9 @@ readStartupPack( if ( errorBBuf.buf != NULL ) { clearBBuf( &errorBBuf ); } - rodsLog( LOG_NOTICE, - "readStartupPack: wrong mag type - %s, expect %s", - myHeader.type, RODS_CONNECT_T ); - return SYS_HEADER_TYPE_LEN_ERR; + std::stringstream msg; + msg << "readStartupPack: wrong mag type - " << myHeader.type << ", expect " << RODS_CONNECT_T; + return ERROR( SYS_HEADER_TYPE_LEN_ERR, msg.str() ); } if ( myHeader.bsLen != 0 ) { @@ -2788,35 +2782,28 @@ readStartupPack( clearBBuf( &inputStructBBuf ); - if ( status >= 0 ) { - if ( ( *startupPack )->clientUser[0] != '\0' && - ( *startupPack )->clientRodsZone[0] == '\0' ) { - char *zoneName; - /* clientRodsZone is not defined */ - if ( ( zoneName = getLocalZoneName() ) != NULL ) { - rstrcpy( ( *startupPack )->clientRodsZone, zoneName, NAME_LEN ); - } - } - if ( ( *startupPack )->proxyUser[0] != '\0' && - ( *startupPack )->proxyRodsZone[0] == '\0' ) { - char *zoneName; - /* proxyRodsZone is not defined */ - if ( ( zoneName = getLocalZoneName() ) != NULL ) { - rstrcpy( ( *startupPack )->proxyRodsZone, zoneName, NAME_LEN ); - } + if ( status < 0 ) { + return ERROR( status, "readStartupPack:unpackStruct error." ); + } + + if ( ( *startupPack )->clientUser[0] != '\0' && + ( *startupPack )->clientRodsZone[0] == '\0' ) { + /* clientRodsZone is not defined */ + if ( const char* zoneName = getLocalZoneName() ) { + rstrcpy( ( *startupPack )->clientRodsZone, zoneName, NAME_LEN ); } } - else { - rodsLogError( LOG_NOTICE, status, - "readStartupPack:unpackStruct error. status = %d", - status ); + if ( ( *startupPack )->proxyUser[0] != '\0' && + ( *startupPack )->proxyRodsZone[0] == '\0' ) { + /* proxyRodsZone is not defined */ + if ( const char* zoneName = getLocalZoneName() ) { + rstrcpy( ( *startupPack )->proxyRodsZone, zoneName, NAME_LEN ); + } } - return status; + return CODE( status ); } - - /* initServiceUser - set the username/uid of the unix user to * run the iRODS daemons as if configured using the * irodsServiceUser environment variable. Will also diff --git a/iRODS/server/core/src/rodsServer.cpp b/iRODS/server/core/src/rodsServer.cpp index 0416d58aba..c222417f24 100644 --- a/iRODS/server/core/src/rodsServer.cpp +++ b/iRODS/server/core/src/rodsServer.cpp @@ -1169,11 +1169,11 @@ readWorkerTask() { struct timeval tv; tv.tv_sec = READ_STARTUP_PACK_TOUT_SEC; tv.tv_usec = 0; - int status = readStartupPack( net_obj, &startupPack, &tv ); + irods::error ret = readStartupPack( net_obj, &startupPack, &tv ); - if ( status < 0 ) { - rodsLog( LOG_ERROR, "readWorkerTask - readStartupPack failed. %d", status ); - sendVersion( net_obj, status, 0, NULL, 0 ); + if ( !ret.ok() ) { + rodsLog( LOG_ERROR, "readWorkerTask - readStartupPack failed. %d", ret.code() ); + sendVersion( net_obj, ret.code(), 0, NULL, 0 ); boost::unique_lock bad_req_lock( BadReqMutex ); @@ -1190,7 +1190,7 @@ readWorkerTask() { } else { if ( startupPack->clientUser[0] == '\0' ) { - status = chkAllowedUser( startupPack->clientUser, + int status = chkAllowedUser( startupPack->clientUser, startupPack->clientRodsZone ); if ( status < 0 ) { sendVersion( net_obj, status, 0, NULL, 0 ); @@ -1269,15 +1269,11 @@ spawnManagerTask() { int procSingleConnReq( agentProc_t *connReq ) { - startupPack_t *startupPack; - int newSock; - int status; - if ( connReq == NULL ) { return USER__NULL_INPUT_ERR; } - newSock = connReq->sock; + int newSock = connReq->sock; // =-=-=-=-=-=-=- // artificially create a conn object in order to @@ -1295,14 +1291,15 @@ procSingleConnReq( agentProc_t *connReq ) { net_obj->socket_handle( newSock ); - status = readStartupPack( net_obj, &startupPack, NULL ); + startupPack_t *startupPack; + ret = readStartupPack( net_obj, &startupPack, NULL ); - if ( status < 0 ) { + if ( !ret.ok() ) { rodsLog( LOG_NOTICE, "readStartupPack error from %s, status = %d", - inet_ntoa( connReq->remoteAddr.sin_addr ), status ); - sendVersion( net_obj, status, 0, NULL, 0 ); + inet_ntoa( connReq->remoteAddr.sin_addr ), ret.code() ); + sendVersion( net_obj, ret.code(), 0, NULL, 0 ); mySockClose( newSock ); - return status; + return ret.code(); } if ( startupPack->connectCnt > MAX_SVR_SVR_CONNECT_CNT ) { @@ -1313,7 +1310,7 @@ procSingleConnReq( agentProc_t *connReq ) { connReq->startupPack = *startupPack; free( startupPack ); - status = spawnAgent( connReq, &ConnectedAgentHead ); + int status = spawnAgent( connReq, &ConnectedAgentHead ); #ifndef windows_platform close( newSock ); diff --git a/iRODS/server/core/src/xmsgLib.cpp b/iRODS/server/core/src/xmsgLib.cpp index f825bdb16b..3e9263a3d9 100644 --- a/iRODS/server/core/src/xmsgLib.cpp +++ b/iRODS/server/core/src/xmsgLib.cpp @@ -47,12 +47,11 @@ initThreadEnv() { int addXmsgToQues( irodsXmsg_t *irodsXmsg, ticketMsgStruct_t *ticketMsgStruct ) { - int status; MessQueCondMutex.lock(); addXmsgToXmsgQue( irodsXmsg, &XmsgQue ); - status = addXmsgToTicketMsgStruct( irodsXmsg, ticketMsgStruct ); + int status = addXmsgToTicketMsgStruct( irodsXmsg, ticketMsgStruct ); MessQueCondMutex.unlock(); @@ -505,10 +504,10 @@ procReqRoutine() { } startupPack_t *startupPack; - int status = readStartupPack( net_obj, &startupPack, NULL ); - if ( status < 0 ) { + ret = readStartupPack( net_obj, &startupPack, NULL ); + if ( !ret.ok() ) { rodsLog( LOG_ERROR, - "procReqRoutine: readStartupPack error, status = %d", status ); + "procReqRoutine: readStartupPack error, status = %d", ret.code() ); free( myXmsgReq ); continue; } @@ -542,8 +541,7 @@ procReqRoutine() { if ( numSock < 0 ) { break; } - status = readAndProcClientMsg( &rsComm, 0 ); - if ( status < 0 ) { + if ( readAndProcClientMsg( &rsComm, 0 ) < 0 ) { break; } } From 6157ad890ef8d102d95c8cd0945e339a6141cd66 Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Wed, 29 Apr 2015 18:11:36 -0400 Subject: [PATCH 38/48] [#858] Use renamed test_all_rules.py in iput --- tests/pydevtest/test_iadmin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pydevtest/test_iadmin.py b/tests/pydevtest/test_iadmin.py index 34f1c28542..76f5e7fafe 100644 --- a/tests/pydevtest/test_iadmin.py +++ b/tests/pydevtest/test_iadmin.py @@ -618,7 +618,7 @@ def test_rebalance_for_repl_in_repl_node(self): # =-=-=-=-=-=-=- # dirty up a foo10 repl to ensure that code path is tested also self.admin.assert_icommand("iadmin modresc unixA2 status down") - self.admin.assert_icommand("iput -fR pt test_allrules.py foo10") + self.admin.assert_icommand("iput -fR pt test_all_rules.py foo10") self.admin.assert_icommand("iadmin modresc unixA2 status up") # =-=-=-=-=-=-=- @@ -765,7 +765,7 @@ def test_rebalance_for_repl_node_with_different_users(self): # =-=-=-=-=-=-=- # dirty up a foo10 repl to ensure that code path is tested also self.admin.assert_icommand("iadmin modresc leaf_a status down") - self.user0.assert_icommand("iput -fR repl test_allrules.py bar2") + self.user0.assert_icommand("iput -fR repl test_all_rules.py bar2") self.admin.assert_icommand("iadmin modresc leaf_a status up") # =-=-=-=-=-=-=- From 32b35e66e30a6b61339460d27b93a8a191f75701 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 29 Apr 2015 23:41:28 -0400 Subject: [PATCH 39/48] [#2571] fill in imeta help for adda and rmi subcommands --- iRODS/clients/icommands/src/imeta.cpp | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/iRODS/clients/icommands/src/imeta.cpp b/iRODS/clients/icommands/src/imeta.cpp index fca3e9cd2e..0806a87c95 100644 --- a/iRODS/clients/icommands/src/imeta.cpp +++ b/iRODS/clients/icommands/src/imeta.cpp @@ -1563,10 +1563,13 @@ void usageMain() { " -h This help", "Commands are:", " add -d|C|R|u Name AttName AttValue [AttUnits] (Add new AVU triple)", + " adda -d|C|R|u Name AttName AttValue [AttUnits] (Add as administrator)", + " (same as 'add' but bypasses ACLs)", " addw -d Name AttName AttValue [AttUnits] (Add new AVU triple", " using Wildcards in Name)", " rm -d|C|R|u Name AttName AttValue [AttUnits] (Remove AVU)", " rmw -d|C|R|u Name AttName AttValue [AttUnits] (Remove AVU, use Wildcards)", + " rmi -d|C|R|u Name MetadataID (Remove AVU by MetadataID)", " mod -d|C|R|u Name AttName AttValue [AttUnits] [n:Name] [v:Value] [u:Units]", " (modify AVU; new name (n:), value(v:), and/or units(u:)", " set -d|C|R|u Name AttName newValue [newUnits] (Assign a single value)", // JMC - backport 4836 @@ -1655,6 +1658,23 @@ usage( char *subOpt ) { printf( "%s\n", msgs[i] ); } } + if ( strcmp( subOpt, "adda" ) == 0 ) { + char *msgs[] = { + " adda -d|C|R|u Name AttName AttValue [AttUnits] (Add as administrator)", + " (same as 'add' but bypasses ACLs)", + " ", + "Administrators (rodsadmin users) may use this command to add AVUs", + "to any dataobj, collection, resource, or user. The syntax is the same", + "as 'imeta add'.", + "" + }; + for ( i = 0;; i++ ) { + if ( strlen( msgs[i] ) == 0 ) { + return 0; + } + printf( "%s\n", msgs[i] ); + } + } if ( strcmp( subOpt, "addw" ) == 0 ) { char *msgs[] = { " addw -d Name AttName AttValue [AttUnits] (Add new AVU triple)", @@ -1723,6 +1743,22 @@ usage( char *subOpt ) { printf( "%s\n", msgs[i] ); } } + if ( strcmp( subOpt, "rmi" ) == 0 ) { + char *msgs[] = { + " rmi -d|C|R|u Name MetadataID (Remove AVU by MetadataID)", + "Remove an AVU from a dataobj (-d), collection(-C), resource(-R),", + "or user(-u) by name and metadataID from the catalog. Intended for", + "expert use. There is no matching done to confirm correctness of", + "a request (but permissions are still checked). Use with caution.", + "" + }; + for ( i = 0;; i++ ) { + if ( strlen( msgs[i] ) == 0 ) { + return 0; + } + printf( "%s\n", msgs[i] ); + } + } if ( strcmp( subOpt, "mod" ) == 0 ) { char *msgs[] = { " mod -d|C|R|u Name AttName AttValue [AttUnits] [n:Name] [v:Value] [u:Units]", From 940c1f7ba127756b186f44e4842770f2ae9d035e Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Thu, 30 Apr 2015 11:09:23 -0400 Subject: [PATCH 40/48] [#2287] use v2 and https for zonereport --- iRODS/server/api/src/rsZoneReport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iRODS/server/api/src/rsZoneReport.cpp b/iRODS/server/api/src/rsZoneReport.cpp index 43ecf898f6..408067feaa 100644 --- a/iRODS/server/api/src/rsZoneReport.cpp +++ b/iRODS/server/api/src/rsZoneReport.cpp @@ -234,7 +234,7 @@ int _rsZoneReport( zone, "schema_version", json_string( - "http://schemas.irods.org/v1/zone_bundle.json" ) ); + "https://schemas.irods.org/configuration/v2/zone_bundle.json" ) ); json_object_set( zone, "zones", zone_arr ); char* tmp_buf = json_dumps( zone, JSON_INDENT( 4 ) ); From b7bca5a020449b65231c91d7d2438f69d84b9214 Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Thu, 30 Apr 2015 11:39:42 -0400 Subject: [PATCH 41/48] [#2457] Renable TLSv1.0 for 4.0.3 compat --- iRODS/lib/core/src/sslSockComm.cpp | 2 +- plugins/network/ssl/libssl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iRODS/lib/core/src/sslSockComm.cpp b/iRODS/lib/core/src/sslSockComm.cpp index 4f45d76d26..d678f2705f 100644 --- a/iRODS/lib/core/src/sslSockComm.cpp +++ b/iRODS/lib/core/src/sslSockComm.cpp @@ -623,7 +623,7 @@ sslInit( char *certfile, char *keyfile ) { SSL_CTX* ctx = SSL_CTX_new( SSLv23_method() ); - SSL_CTX_set_options( ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_SINGLE_DH_USE ); + SSL_CTX_set_options( ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_SINGLE_DH_USE ); /* load our keys and certificates if provided */ if ( certfile ) { diff --git a/plugins/network/ssl/libssl.cpp b/plugins/network/ssl/libssl.cpp index bdb5faba7e..8f0fe95bdd 100644 --- a/plugins/network/ssl/libssl.cpp +++ b/plugins/network/ssl/libssl.cpp @@ -215,7 +215,7 @@ static SSL_CTX* ssl_init_context( ctx = SSL_CTX_new( SSLv23_method() ); - SSL_CTX_set_options( ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_SINGLE_DH_USE ); + SSL_CTX_set_options( ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_SINGLE_DH_USE ); /* load our keys and certificates if provided */ if ( certfile ) { From 05f3c66f06f48f7f50a8708012a30b757b85efe6 Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Thu, 30 Apr 2015 13:48:35 -0400 Subject: [PATCH 42/48] [#2455] Add python-jsonschema package dependency --- packaging/irods.list.template | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/irods.list.template b/packaging/irods.list.template index 290b8a6bd5..f1e8e23aa5 100644 --- a/packaging/irods.list.template +++ b/packaging/irods.list.template @@ -107,6 +107,7 @@ $RESOURCE=true %requires openssl %requires python-psutil %requires python-requests +%requires python-jsonschema %endif From 534bf82f57cceb4ed6c805efec6b2710211b5963 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Thu, 30 Apr 2015 15:45:49 -0400 Subject: [PATCH 43/48] [#2455] detect and warn about old jsonschema --- iRODS/scripts/python/validate_json.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/iRODS/scripts/python/validate_json.py b/iRODS/scripts/python/validate_json.py index 994026521d..7ba391bd18 100644 --- a/iRODS/scripts/python/validate_json.py +++ b/iRODS/scripts/python/validate_json.py @@ -18,6 +18,13 @@ def print_error(*args, **kwargs): print_error('WARNING: Validation Failed for [%s] -- jsonschema not installed' % config_file) sys.exit(0) +try: + e = jsonschema.exceptions +except AttributeError: + print_error('WARNING: Validation Failed for [%s] -- jsonschema too old v[%s]' % + (config_file, jsonschema.__version__) ) + sys.exit(0) + try: # load configuration file with open(config_file, 'r') as f: From 6d0bebc9f8c63f3281239bceb5c9601bd7146378 Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Thu, 30 Apr 2015 15:58:21 -0400 Subject: [PATCH 44/48] [#2299] json_loads 2nd parameter is flags, not length --- iRODS/clients/icommands/src/irods-grid.cpp | 7 ++----- iRODS/server/api/src/rsClientHints.cpp | 7 +------ iRODS/server/api/src/rsZoneReport.cpp | 6 ++---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/iRODS/clients/icommands/src/irods-grid.cpp b/iRODS/clients/icommands/src/irods-grid.cpp index df89d9794f..3d2e855f83 100644 --- a/iRODS/clients/icommands/src/irods-grid.cpp +++ b/iRODS/clients/icommands/src/irods-grid.cpp @@ -1,4 +1,3 @@ - #include "zmq.hpp" #include "avro/Encoder.hh" #include "avro/Decoder.hh" @@ -267,13 +266,13 @@ std::string format_grid_status( } else { // possible error message return _status; - + } json_error_t j_err; json_t* obj = json_loads( ( char* )status.data(), - status.size(), + JSON_REJECT_DUPLICATES, &j_err ); if ( !obj ) { if ( std::string::npos != _status.find( irods::SERVER_PAUSED_ERROR ) ) { @@ -401,5 +400,3 @@ int main( return 0; } // main - - diff --git a/iRODS/server/api/src/rsClientHints.cpp b/iRODS/server/api/src/rsClientHints.cpp index 50cbe1d7d0..ab78c11034 100644 --- a/iRODS/server/api/src/rsClientHints.cpp +++ b/iRODS/server/api/src/rsClientHints.cpp @@ -1,4 +1,3 @@ - #include "rsGlobalExtern.hpp" #include "rodsErrorTable.hpp" @@ -120,7 +119,7 @@ int _rsClientHints( json_error_t j_err; json_t* client_hints = json_loads( ( char* )ies_buf->buf, - ies_buf->len, &j_err ); + JSON_REJECT_DUPLICATES, &j_err ); freeBBuf( ies_buf ); if ( !client_hints ) { rodsLog( @@ -159,7 +158,3 @@ int _rsClientHints( return 0; } // _rsClientHints - - - - diff --git a/iRODS/server/api/src/rsZoneReport.cpp b/iRODS/server/api/src/rsZoneReport.cpp index 408067feaa..488c020b98 100644 --- a/iRODS/server/api/src/rsZoneReport.cpp +++ b/iRODS/server/api/src/rsZoneReport.cpp @@ -1,4 +1,3 @@ - #include "rsGlobalExtern.hpp" #include "rodsErrorTable.hpp" #include "miscServerFunct.hpp" @@ -139,7 +138,7 @@ irods::error get_server_reports( json_error_t j_err; json_t* j_resc = json_loads( tmp_str.data(), - tmp_str.size(), + JSON_REJECT_DUPLICATES, &j_err ); freeBBuf( bbuf ); @@ -180,7 +179,7 @@ int _rsZoneReport( } json_error_t j_err; - json_t* cat_svr = json_loads( ( char* )bbuf->buf, bbuf->len, &j_err ); + json_t* cat_svr = json_loads( ( char* )bbuf->buf, JSON_REJECT_DUPLICATES, &j_err ); freeBBuf( bbuf ); if ( !cat_svr ) { rodsLog( @@ -259,4 +258,3 @@ int _rsZoneReport( } // _rsZoneReport #endif // RODS_CAT - From c3bc8618cd8428f6a2ee687c2f706db9e91d1716 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Thu, 30 Apr 2015 11:21:51 -0400 Subject: [PATCH 45/48] [#2648] remove unnecessary header in server/core --- iRODS/server/core/include/irodsReServer.hpp | 1 - iRODS/server/core/include/irodsXmsgServer.hpp | 1 - iRODS/server/core/include/rodsAgent.hpp | 1 - iRODS/server/core/include/rodsServer.hpp | 3 +-- iRODS/server/core/include/rsMisc.hpp | 15 --------------- iRODS/server/core/include/xmsgLib.hpp | 1 - iRODS/server/re/include/reIn2p3SysRule.hpp | 1 - iRODS/server/re/src/functions.cpp | 1 - 8 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 iRODS/server/core/include/rsMisc.hpp diff --git a/iRODS/server/core/include/irodsReServer.hpp b/iRODS/server/core/include/irodsReServer.hpp index 31f89e5878..12f67030c0 100644 --- a/iRODS/server/core/include/irodsReServer.hpp +++ b/iRODS/server/core/include/irodsReServer.hpp @@ -14,7 +14,6 @@ #include "rsLog.hpp" #include "rodsLog.hpp" #include "sockComm.hpp" -#include "rsMisc.hpp" #include "getRodsEnv.hpp" #include "rcConnect.hpp" diff --git a/iRODS/server/core/include/irodsXmsgServer.hpp b/iRODS/server/core/include/irodsXmsgServer.hpp index fdb0e7b031..89f26814e3 100644 --- a/iRODS/server/core/include/irodsXmsgServer.hpp +++ b/iRODS/server/core/include/irodsXmsgServer.hpp @@ -15,7 +15,6 @@ #include "rsLog.hpp" #include "rodsLog.hpp" #include "sockComm.hpp" -#include "rsMisc.hpp" #include "getRodsEnv.hpp" #include "rcConnect.hpp" diff --git a/iRODS/server/core/include/rodsAgent.hpp b/iRODS/server/core/include/rodsAgent.hpp index 29a756209c..b1cd02bf6b 100644 --- a/iRODS/server/core/include/rodsAgent.hpp +++ b/iRODS/server/core/include/rodsAgent.hpp @@ -14,7 +14,6 @@ #include "rsLog.hpp" #include "rodsLog.hpp" #include "sockComm.hpp" -#include "rsMisc.hpp" #include "getRodsEnv.hpp" #include "rcConnect.hpp" diff --git a/iRODS/server/core/include/rodsServer.hpp b/iRODS/server/core/include/rodsServer.hpp index cd5cdd0221..a36daa73b6 100644 --- a/iRODS/server/core/include/rodsServer.hpp +++ b/iRODS/server/core/include/rodsServer.hpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /*------------------------------------------------------------------------- * - * rodsServer.h-- Header file for rodsServer.c + * rodsServer.hpp-- Header file for rodsServer.cpp * * * @@ -24,7 +24,6 @@ #include "rsLog.hpp" #include "rodsLog.hpp" #include "sockComm.hpp" -#include "rsMisc.hpp" #include "rsIcatOpr.hpp" #include "getRodsEnv.hpp" #include "rcConnect.hpp" diff --git a/iRODS/server/core/include/rsMisc.hpp b/iRODS/server/core/include/rsMisc.hpp deleted file mode 100644 index 2ad4bfe449..0000000000 --- a/iRODS/server/core/include/rsMisc.hpp +++ /dev/null @@ -1,15 +0,0 @@ -/*** Copyright (c), The Regents of the University of California *** - *** For more information please refer to files in the COPYRIGHT directory ***/ - -/* rsMisc.h - common header file for rods server and agents - */ - - - -#ifndef RS_MISC_HPP -#define RS_MISC_HPP - -#include "rods.hpp" - -#define MIN_AGENT_TIMEOUT_TIME 7200 -#endif /* RS_MISC_H */ diff --git a/iRODS/server/core/include/xmsgLib.hpp b/iRODS/server/core/include/xmsgLib.hpp index c4a000057f..e44149a06f 100644 --- a/iRODS/server/core/include/xmsgLib.hpp +++ b/iRODS/server/core/include/xmsgLib.hpp @@ -15,7 +15,6 @@ #include "rsLog.hpp" #include "rodsLog.hpp" #include "sockComm.hpp" -#include "rsMisc.hpp" #include "getRodsEnv.hpp" #include "rcConnect.hpp" #include "rodsXmsg.hpp" diff --git a/iRODS/server/re/include/reIn2p3SysRule.hpp b/iRODS/server/re/include/reIn2p3SysRule.hpp index d9b2163e0a..b60f8d7f0f 100644 --- a/iRODS/server/re/include/reIn2p3SysRule.hpp +++ b/iRODS/server/re/include/reIn2p3SysRule.hpp @@ -14,7 +14,6 @@ #include "rsLog.hpp" #include "rodsLog.hpp" #include "sockComm.hpp" -#include "rsMisc.hpp" #include "getRodsEnv.hpp" #include "rcConnect.hpp" #include "generalRowInsert.hpp" diff --git a/iRODS/server/re/src/functions.cpp b/iRODS/server/re/src/functions.cpp index 151ed116a0..814b8a5b88 100644 --- a/iRODS/server/re/src/functions.cpp +++ b/iRODS/server/re/src/functions.cpp @@ -23,7 +23,6 @@ getDataObjInfoIncSpecColl( rsComm_t *rsComm, dataObjInp_t *dataObjInp, #include "execMyRule.hpp" #include "msParam.hpp" #include "reFuncDefs.hpp" -#include "rsMisc.hpp" #include "stringOpr.hpp" #include "miscServerFunct.hpp" #endif From ef26492f0b7d5865e5eab41805edb29962753ec2 Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Thu, 30 Apr 2015 12:03:16 -0400 Subject: [PATCH 46/48] [#2222] more efficient variable declaration --- iRODS/clients/fuse/src/irodsFs.cpp | 9 ++------- iRODS/clients/icommands/src/icd.cpp | 1 - iRODS/lib/core/include/rods.hpp | 1 - packaging/build.sh | 12 ++++++------ 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/iRODS/clients/fuse/src/irodsFs.cpp b/iRODS/clients/fuse/src/irodsFs.cpp index 4e4722fd8f..2aec4d95ef 100644 --- a/iRODS/clients/fuse/src/irodsFs.cpp +++ b/iRODS/clients/fuse/src/irodsFs.cpp @@ -110,11 +110,6 @@ main( int argc, char **argv ) { irodsOper.fsync = irodsFsync; irodsOper.flush = irodsFlush; - - int status; - rodsArguments_t myRodsArgs; - char *optStr; - #ifdef __cplusplus bzero( &irodsOper, sizeof( irodsOper ) ); irodsOper.getattr = irodsGetattr; @@ -139,9 +134,9 @@ main( int argc, char **argv ) { irodsOper.fsync = irodsFsync; irodsOper.flush = irodsFlush; #endif - optStr = "Zhdo:"; - status = parseCmdLineOpt( argc, argv, optStr, 1, &myRodsArgs ); + rodsArguments_t myRodsArgs; + int status = parseCmdLineOpt( argc, argv, "Zhdo:", 1, &myRodsArgs ); if ( status < 0 ) { printf( "Use -h for help.\n" ); diff --git a/iRODS/clients/icommands/src/icd.cpp b/iRODS/clients/icommands/src/icd.cpp index c586f0f92e..d9a9d83838 100644 --- a/iRODS/clients/icommands/src/icd.cpp +++ b/iRODS/clients/icommands/src/icd.cpp @@ -7,7 +7,6 @@ #include "miscUtil.hpp" #include "rcMisc.hpp" #include "genQuery.hpp" -#include "apiHandler.hpp" #include "rodsClient.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/lib/core/include/rods.hpp b/iRODS/lib/core/include/rods.hpp index 2e971f62a0..fa90cbd505 100644 --- a/iRODS/lib/core/include/rods.hpp +++ b/iRODS/lib/core/include/rods.hpp @@ -20,7 +20,6 @@ #include "getRodsEnv.hpp" #include "dataObjInpOut.hpp" #include "rodsGenQuery.hpp" -//#include "authenticate.hpp" #include "parseCommandLine.hpp" #include "obf.hpp" #include "rodsXmsg.hpp" diff --git a/packaging/build.sh b/packaging/build.sh index 6aee3886bc..6c72a19470 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -530,7 +530,7 @@ if [ "$1" == "clean" ] ; then rm -rf linux-3.* rm -rf macosx-10.* rm -f iRODS/server/config/scriptMonPerf.config - rm -f iRODS/lib/core/include/rodsVersion.hpp + rm -f iRODS/lib/core/include/rodsVersion.h rm -f iRODS/server/core/include/irods_plugin_home_directory.hpp rm -f iRODS/lib/core/include/irods_home_directory.hpp # database plugin cleanup @@ -1070,11 +1070,11 @@ mv $TMPFILE VERSION.json cd $BUILDDIR TEMPLATE_RODS_RELEASE_VERSION=`python packaging/get_irods_version.py` TEMPLATE_RODS_RELEASE_DATE=`date +"%b %Y"` -sed -e "s,TEMPLATE_RODS_RELEASE_VERSION,$TEMPLATE_RODS_RELEASE_VERSION," ./iRODS/lib/core/include/rodsVersion.hpp.template > /tmp/rodsVersion.hpp -sed -e "s,TEMPLATE_RODS_RELEASE_DATE,$TEMPLATE_RODS_RELEASE_DATE," /tmp/rodsVersion.hpp > /tmp/rodsVersion.hpp.2 -rsync -c /tmp/rodsVersion.hpp.2 ./iRODS/lib/core/include/rodsVersion.hpp -rm -f /tmp/rodsVersion.hpp -rm -f /tmp/rodsVersion.hpp.2 +sed -e "s,TEMPLATE_RODS_RELEASE_VERSION,$TEMPLATE_RODS_RELEASE_VERSION," ./iRODS/lib/core/include/rodsVersion.h.template > /tmp/rodsVersion.h +sed -e "s,TEMPLATE_RODS_RELEASE_DATE,$TEMPLATE_RODS_RELEASE_DATE," /tmp/rodsVersion.h > /tmp/rodsVersion.h.2 +rsync -c /tmp/rodsVersion.h.2 ./iRODS/lib/core/include/rodsVersion.h +rm -f /tmp/rodsVersion.h +rm -f /tmp/rodsVersion.h.2 cd $BUILDDIR/iRODS if [ $1 == "icat" ] ; then From 00b78660acbccbe78fa2c319a0a47c552334d8fd Mon Sep 17 00:00:00 2001 From: Zoey Greer Date: Thu, 30 Apr 2015 16:12:26 -0400 Subject: [PATCH 47/48] [#2222] [#2648] move C header files to .h extensions --- .gitignore | 2 +- docs/Admin_Guide.md | 2 +- examples/resources/libexamplefilesystem.cpp | 2 +- iRODS/clients/c_api_test/test.c | 10 +- iRODS/clients/fuse/include/iFuseLib.hpp | 4 +- iRODS/clients/fuse/include/iFuseOper.hpp | 4 +- iRODS/clients/fuse/include/irodsFs.hpp | 6 +- iRODS/clients/fuse/src/iFuseLib.FileCache.cpp | 2 +- iRODS/clients/fuse/src/iFuseOper.cpp | 2 +- iRODS/clients/fuse/src/irodsFs.cpp | 2 +- iRODS/clients/icommands/src/genOSAuth.cpp | 3 +- iRODS/clients/icommands/src/iadmin.cpp | 4 +- iRODS/clients/icommands/src/iapitest.cpp | 6 +- iRODS/clients/icommands/src/ibun.cpp | 6 +- iRODS/clients/icommands/src/icd.cpp | 8 +- iRODS/clients/icommands/src/ichksum.cpp | 6 +- iRODS/clients/icommands/src/ichmod.cpp | 6 +- iRODS/clients/icommands/src/icp.cpp | 6 +- iRODS/clients/icommands/src/idbug.cpp | 2 +- iRODS/clients/icommands/src/ienv.cpp | 4 +- iRODS/clients/icommands/src/ierror.cpp | 4 +- iRODS/clients/icommands/src/iexecmd.cpp | 6 +- iRODS/clients/icommands/src/iexit.cpp | 4 +- iRODS/clients/icommands/src/ifsck.cpp | 6 +- iRODS/clients/icommands/src/iget.cpp | 6 +- iRODS/clients/icommands/src/igroupadmin.cpp | 4 +- iRODS/clients/icommands/src/ihelp.cpp | 4 +- iRODS/clients/icommands/src/iinit.cpp | 6 +- iRODS/clients/icommands/src/ils.cpp | 6 +- iRODS/clients/icommands/src/ilsresc.cpp | 4 +- iRODS/clients/icommands/src/imcoll.cpp | 6 +- iRODS/clients/icommands/src/imeta.cpp | 4 +- iRODS/clients/icommands/src/imiscsvrinfo.cpp | 4 +- iRODS/clients/icommands/src/imkdir.cpp | 6 +- iRODS/clients/icommands/src/imv.cpp | 6 +- iRODS/clients/icommands/src/ipasswd.cpp | 4 +- iRODS/clients/icommands/src/iphybun.cpp | 6 +- iRODS/clients/icommands/src/iphymv.cpp | 6 +- iRODS/clients/icommands/src/ips.cpp | 4 +- iRODS/clients/icommands/src/iput.cpp | 6 +- iRODS/clients/icommands/src/ipwd.cpp | 4 +- iRODS/clients/icommands/src/iqdel.cpp | 4 +- iRODS/clients/icommands/src/iqmod.cpp | 4 +- iRODS/clients/icommands/src/iqstat.cpp | 4 +- iRODS/clients/icommands/src/iquest.cpp | 6 +- iRODS/clients/icommands/src/iquota.cpp | 4 +- iRODS/clients/icommands/src/ireg.cpp | 6 +- iRODS/clients/icommands/src/irepl.cpp | 6 +- iRODS/clients/icommands/src/irm.cpp | 6 +- iRODS/clients/icommands/src/irmtrash.cpp | 6 +- iRODS/clients/icommands/src/irods-grid.cpp | 2 +- iRODS/clients/icommands/src/irsync.cpp | 6 +- iRODS/clients/icommands/src/irule.cpp | 6 +- iRODS/clients/icommands/src/iscan.cpp | 6 +- iRODS/clients/icommands/src/isysmeta.cpp | 2 +- iRODS/clients/icommands/src/iticket.cpp | 4 +- iRODS/clients/icommands/src/itrim.cpp | 6 +- iRODS/clients/icommands/src/iuserinfo.cpp | 4 +- iRODS/clients/icommands/src/ixmsg.cpp | 2 +- iRODS/clients/icommands/src/izonereport.cpp | 6 +- iRODS/clients/icommands/test/misc/i.cpp | 4 +- .../icommands/test/misc/iTestGenQuery.cpp | 4 +- iRODS/lib/Makefile | 2 +- iRODS/lib/api/include/apiHeaderAll.hpp | 2 +- .../include/{apiNumber.hpp => apiNumber.h} | 6 +- iRODS/lib/api/include/apiPackTable.hpp | 4 +- iRODS/lib/api/include/apiTable.hpp | 6 +- iRODS/lib/api/include/authCheck.hpp | 6 +- iRODS/lib/api/include/authPluginRequest.hpp | 6 +- iRODS/lib/api/include/authRequest.hpp | 6 +- iRODS/lib/api/include/authResponse.hpp | 6 +- iRODS/lib/api/include/authenticate.hpp | 6 +- iRODS/lib/api/include/bulkDataObjPut.hpp | 6 +- iRODS/lib/api/include/bulkDataObjReg.hpp | 8 +- iRODS/lib/api/include/chkNVPathPerm.hpp | 6 +- iRODS/lib/api/include/chkObjPermAndStat.hpp | 8 +- iRODS/lib/api/include/client_hints.hpp | 6 +- iRODS/lib/api/include/closeCollection.hpp | 8 +- iRODS/lib/api/include/collCreate.hpp | 8 +- iRODS/lib/api/include/collRepl.hpp | 6 +- iRODS/lib/api/include/dataCopy.hpp | 8 +- iRODS/lib/api/include/dataGet.hpp | 6 +- iRODS/lib/api/include/dataObjChksum.hpp | 8 +- iRODS/lib/api/include/dataObjClose.hpp | 6 +- iRODS/lib/api/include/dataObjCopy.hpp | 4 +- iRODS/lib/api/include/dataObjCreate.hpp | 8 +- .../lib/api/include/dataObjCreateAndStat.hpp | 8 +- iRODS/lib/api/include/dataObjGet.hpp | 6 +- .../{dataObjInpOut.hpp => dataObjInpOut.h} | 8 +- iRODS/lib/api/include/dataObjLock.hpp | 8 +- iRODS/lib/api/include/dataObjLseek.hpp | 6 +- iRODS/lib/api/include/dataObjOpen.hpp | 8 +- iRODS/lib/api/include/dataObjOpenAndStat.hpp | 8 +- iRODS/lib/api/include/dataObjPhymv.hpp | 6 +- iRODS/lib/api/include/dataObjPut.hpp | 6 +- iRODS/lib/api/include/dataObjRead.hpp | 6 +- iRODS/lib/api/include/dataObjRename.hpp | 6 +- iRODS/lib/api/include/dataObjRepl.hpp | 6 +- iRODS/lib/api/include/dataObjRsync.hpp | 6 +- iRODS/lib/api/include/dataObjTrim.hpp | 6 +- iRODS/lib/api/include/dataObjTruncate.hpp | 8 +- iRODS/lib/api/include/dataObjUnlink.hpp | 8 +- iRODS/lib/api/include/dataObjWrite.hpp | 6 +- iRODS/lib/api/include/dataPut.hpp | 6 +- iRODS/lib/api/include/endTransaction.hpp | 6 +- iRODS/lib/api/include/execCmd.hpp | 6 +- iRODS/lib/api/include/execMyRule.hpp | 8 +- iRODS/lib/api/include/fileChksum.hpp | 6 +- iRODS/lib/api/include/fileChmod.hpp | 6 +- iRODS/lib/api/include/fileClose.hpp | 6 +- iRODS/lib/api/include/fileClosedir.hpp | 6 +- iRODS/lib/api/include/fileCreate.hpp | 4 +- iRODS/lib/api/include/fileGet.hpp | 6 +- iRODS/lib/api/include/fileGetFsFreeSpace.hpp | 6 +- iRODS/lib/api/include/fileLseek.hpp | 6 +- iRODS/lib/api/include/fileMkdir.hpp | 6 +- iRODS/lib/api/include/fileOpen.hpp | 4 +- iRODS/lib/api/include/fileOpendir.hpp | 6 +- iRODS/lib/api/include/filePut.hpp | 6 +- iRODS/lib/api/include/fileRead.hpp | 6 +- iRODS/lib/api/include/fileReaddir.hpp | 6 +- iRODS/lib/api/include/fileRename.hpp | 6 +- iRODS/lib/api/include/fileRmdir.hpp | 6 +- iRODS/lib/api/include/fileStageToCache.hpp | 6 +- iRODS/lib/api/include/fileStat.hpp | 6 +- iRODS/lib/api/include/fileSyncToArch.hpp | 6 +- iRODS/lib/api/include/fileTruncate.hpp | 6 +- iRODS/lib/api/include/fileUnlink.hpp | 6 +- iRODS/lib/api/include/fileWrite.hpp | 6 +- iRODS/lib/api/include/genQuery.hpp | 8 +- iRODS/lib/api/include/generalAdmin.hpp | 6 +- iRODS/lib/api/include/generalRowInsert.hpp | 6 +- iRODS/lib/api/include/generalRowPurge.hpp | 6 +- iRODS/lib/api/include/generalUpdate.hpp | 6 +- iRODS/lib/api/include/getHierarchyForResc.hpp | 6 +- iRODS/lib/api/include/getHostForGet.hpp | 6 +- iRODS/lib/api/include/getHostForPut.hpp | 6 +- iRODS/lib/api/include/getLimitedPassword.hpp | 6 +- iRODS/lib/api/include/getMiscSvrInfo.hpp | 6 +- iRODS/lib/api/include/getRemoteZoneResc.hpp | 8 +- iRODS/lib/api/include/getRescQuota.hpp | 8 +- iRODS/lib/api/include/getTempPassword.hpp | 6 +- .../api/include/getTempPasswordForOther.hpp | 6 +- iRODS/lib/api/include/getXmsgTicket.hpp | 8 +- iRODS/lib/api/include/ies_client_hints.hpp | 6 +- iRODS/lib/api/include/l3FileGetSingleBuf.hpp | 6 +- iRODS/lib/api/include/l3FilePutSingleBuf.hpp | 6 +- iRODS/lib/api/include/modAVUMetadata.hpp | 6 +- iRODS/lib/api/include/modAccessControl.hpp | 6 +- iRODS/lib/api/include/modColl.hpp | 8 +- iRODS/lib/api/include/modDataObjMeta.hpp | 8 +- .../api/include/{objStat.hpp => objStat.h} | 21 ++-- iRODS/lib/api/include/openCollection.hpp | 8 +- iRODS/lib/api/include/oprComplete.hpp | 6 +- iRODS/lib/api/include/pamAuthRequest.hpp | 6 +- iRODS/lib/api/include/phyBundleColl.hpp | 6 +- iRODS/lib/api/include/phyPathReg.hpp | 8 +- iRODS/lib/api/include/procStat.hpp | 4 +- iRODS/lib/api/include/querySpecColl.hpp | 6 +- iRODS/lib/api/include/rcvXmsg.hpp | 8 +- iRODS/lib/api/include/readCollection.hpp | 8 +- iRODS/lib/api/include/regColl.hpp | 8 +- iRODS/lib/api/include/regDataObj.hpp | 8 +- iRODS/lib/api/include/regReplica.hpp | 8 +- iRODS/lib/api/include/rmColl.hpp | 8 +- iRODS/lib/api/include/ruleExecDel.hpp | 6 +- iRODS/lib/api/include/ruleExecMod.hpp | 6 +- iRODS/lib/api/include/ruleExecSubmit.hpp | 6 +- iRODS/lib/api/include/sendXmsg.hpp | 8 +- iRODS/lib/api/include/server_report.hpp | 6 +- iRODS/lib/api/include/simpleQuery.hpp | 6 +- iRODS/lib/api/include/specificQuery.hpp | 8 +- iRODS/lib/api/include/sslEnd.hpp | 12 +- iRODS/lib/api/include/sslStart.hpp | 6 +- iRODS/lib/api/include/streamClose.hpp | 6 +- iRODS/lib/api/include/streamRead.hpp | 6 +- iRODS/lib/api/include/structFileBundle.hpp | 6 +- iRODS/lib/api/include/structFileExtAndReg.hpp | 6 +- iRODS/lib/api/include/structFileExtract.hpp | 6 +- iRODS/lib/api/include/structFileSync.hpp | 6 +- iRODS/lib/api/include/subStructFileClose.hpp | 6 +- .../lib/api/include/subStructFileClosedir.hpp | 6 +- iRODS/lib/api/include/subStructFileCreate.hpp | 6 +- iRODS/lib/api/include/subStructFileGet.hpp | 6 +- iRODS/lib/api/include/subStructFileLseek.hpp | 6 +- iRODS/lib/api/include/subStructFileMkdir.hpp | 6 +- iRODS/lib/api/include/subStructFileOpen.hpp | 6 +- .../lib/api/include/subStructFileOpendir.hpp | 6 +- iRODS/lib/api/include/subStructFilePut.hpp | 6 +- iRODS/lib/api/include/subStructFileRead.hpp | 6 +- .../lib/api/include/subStructFileReaddir.hpp | 6 +- iRODS/lib/api/include/subStructFileRename.hpp | 6 +- iRODS/lib/api/include/subStructFileRmdir.hpp | 6 +- iRODS/lib/api/include/subStructFileStat.hpp | 6 +- .../lib/api/include/subStructFileTruncate.hpp | 6 +- iRODS/lib/api/include/subStructFileUnlink.hpp | 6 +- iRODS/lib/api/include/subStructFileWrite.hpp | 6 +- iRODS/lib/api/include/syncMountedColl.hpp | 8 +- iRODS/lib/api/include/ticketAdmin.hpp | 6 +- .../lib/api/include/unbunAndRegPhyBunfile.hpp | 6 +- iRODS/lib/api/include/unregDataObj.hpp | 8 +- iRODS/lib/api/include/userAdmin.hpp | 6 +- iRODS/lib/api/include/zone_report.hpp | 6 +- iRODS/lib/api/src/rcDataObjGet.cpp | 2 +- iRODS/lib/api/src/rcDataObjPut.cpp | 2 +- iRODS/lib/api/src/rcObjStat.cpp | 2 +- iRODS/lib/core/include/apiHandler.hpp | 2 +- iRODS/lib/core/include/bunUtil.hpp | 6 +- iRODS/lib/core/include/chksumUtil.hpp | 6 +- iRODS/lib/core/include/cpUtil.hpp | 6 +- iRODS/lib/core/include/fsckUtil.hpp | 6 +- .../include/{getRodsEnv.hpp => getRodsEnv.h} | 17 +-- iRODS/lib/core/include/getUtil.hpp | 6 +- ...ressCallback.hpp => guiProgressCallback.h} | 4 +- iRODS/lib/core/include/irods_auth_object.hpp | 2 +- iRODS/lib/core/include/irods_auth_types.hpp | 2 +- .../irods_client_server_negotiation.hpp | 2 +- iRODS/lib/core/include/irods_error.hpp | 2 +- .../core/include/irods_first_class_object.hpp | 2 +- iRODS/lib/core/include/irods_log.hpp | 4 +- iRODS/lib/core/include/irods_lookup_table.hpp | 3 +- .../core/include/irods_native_auth_object.hpp | 2 +- .../lib/core/include/irods_network_object.hpp | 2 +- .../lib/core/include/irods_network_types.hpp | 2 +- ..._operation_rule_execution_manager_base.hpp | 2 +- .../core/include/irods_operation_wrapper.hpp | 2 +- .../core/include/irods_osauth_auth_object.hpp | 2 +- .../core/include/irods_pam_auth_object.hpp | 2 +- .../irods_parse_command_line_options.hpp | 2 +- iRODS/lib/core/include/irods_plugin_base.hpp | 2 +- iRODS/lib/core/include/lsUtil.hpp | 6 +- iRODS/lib/core/include/mcollUtil.hpp | 6 +- iRODS/lib/core/include/miscUtil.hpp | 6 +- iRODS/lib/core/include/mkdirUtil.hpp | 6 +- iRODS/lib/core/include/msParam.hpp | 7 +- iRODS/lib/core/include/mvUtil.hpp | 6 +- iRODS/lib/core/include/{obf.hpp => obf.h} | 14 ++- .../core/include/{objInfo.hpp => objInfo.h} | 18 +-- .../lib/core/include/{osauth.hpp => osauth.h} | 11 +- ...arseCommandLine.hpp => parseCommandLine.h} | 20 ++-- iRODS/lib/core/include/phybunUtil.hpp | 6 +- iRODS/lib/core/include/phymvUtil.hpp | 6 +- .../{procApiRequest.hpp => procApiRequest.h} | 8 +- iRODS/lib/core/include/putUtil.hpp | 6 +- .../include/{rcConnect.hpp => rcConnect.h} | 32 ++--- iRODS/lib/core/include/rcGlobal.hpp | 8 +- iRODS/lib/core/include/rcGlobalExtern.hpp | 6 +- iRODS/lib/core/include/rcMisc.hpp | 8 +- iRODS/lib/core/include/rcPortalOpr.hpp | 7 +- iRODS/lib/core/include/regUtil.hpp | 6 +- iRODS/lib/core/include/replUtil.hpp | 6 +- iRODS/lib/core/include/rmUtil.hpp | 6 +- iRODS/lib/core/include/rmtrashUtil.hpp | 6 +- iRODS/lib/core/include/rods.h | 53 +++++++++ iRODS/lib/core/include/rods.hpp | 64 ---------- .../include/{rodsClient.hpp => rodsClient.h} | 8 +- .../include/{rodsError.hpp => rodsError.h} | 5 +- .../{rodsErrorTable.hpp => rodsErrorTable.h} | 10 +- .../{rodsGenQuery.hpp => rodsGenQuery.h} | 8 +- iRODS/lib/core/include/rodsGenQueryNames.hpp | 2 +- iRODS/lib/core/include/rodsGeneralUpdate.hpp | 4 +- .../{rodsKeyWdDef.hpp => rodsKeyWdDef.h} | 12 +- .../core/include/{rodsLog.hpp => rodsLog.h} | 6 +- ...odsPackInstruct.hpp => rodsPackInstruct.h} | 15 +-- iRODS/lib/core/include/rodsPackTable.hpp | 6 +- .../core/include/{rodsPath.hpp => rodsPath.h} | 25 ++-- .../include/{rodsQuota.hpp => rodsQuota.h} | 6 +- .../core/include/{rodsType.hpp => rodsType.h} | 6 +- .../core/include/{rodsUser.hpp => rodsUser.h} | 6 +- ...on.hpp.template => rodsVersion.h.template} | 6 +- iRODS/lib/core/include/rodsXmsg.h | 105 +++++++++++++++++ iRODS/lib/core/include/rodsXmsg.hpp | 110 ------------------ iRODS/lib/core/include/rsyncUtil.hpp | 6 +- iRODS/lib/core/include/scanUtil.hpp | 6 +- .../core/include/{sockComm.hpp => sockComm.h} | 10 +- .../{sslSockComm.hpp => sslSockComm.h} | 10 +- .../include/{stringOpr.hpp => stringOpr.h} | 6 +- iRODS/lib/core/include/trimUtil.hpp | 6 +- iRODS/lib/core/src/base64.cpp | 2 +- iRODS/lib/core/src/bunUtil.cpp | 6 +- iRODS/lib/core/src/chksumUtil.cpp | 6 +- iRODS/lib/core/src/clientLogin.cpp | 4 +- iRODS/lib/core/src/cpUtil.cpp | 6 +- iRODS/lib/core/src/fsckUtil.cpp | 6 +- iRODS/lib/core/src/getRodsEnv.cpp | 8 +- iRODS/lib/core/src/getUtil.cpp | 8 +- iRODS/lib/core/src/irods_children_parser.cpp | 2 +- .../lib/core/src/irods_client_negotiation.cpp | 2 +- .../core/src/irods_environment_properties.cpp | 2 +- iRODS/lib/core/src/irods_error.cpp | 2 +- .../irods_get_full_path_for_config_file.cpp | 1 + iRODS/lib/core/src/irods_hierarchy_parser.cpp | 2 +- .../lib/core/src/irods_kvp_string_parser.cpp | 2 +- iRODS/lib/core/src/irods_log.cpp | 2 +- .../src/irods_parse_command_line_options.cpp | 2 +- .../core/src/irods_plugin_name_generator.cpp | 2 +- iRODS/lib/core/src/irods_serialization.cpp | 2 +- .../lib/core/src/irods_server_properties.cpp | 2 +- iRODS/lib/core/src/irods_stacktrace.cpp | 2 +- iRODS/lib/core/src/lsUtil.cpp | 6 +- iRODS/lib/core/src/mcollUtil.cpp | 6 +- iRODS/lib/core/src/miscUtil.cpp | 4 +- iRODS/lib/core/src/mkdirUtil.cpp | 6 +- iRODS/lib/core/src/mvUtil.cpp | 6 +- iRODS/lib/core/src/obf.cpp | 4 +- iRODS/lib/core/src/osauth.cpp | 3 +- iRODS/lib/core/src/packStruct.cpp | 2 +- iRODS/lib/core/src/parseCommandLine.cpp | 8 +- iRODS/lib/core/src/phybunUtil.cpp | 6 +- iRODS/lib/core/src/phymvUtil.cpp | 6 +- iRODS/lib/core/src/procApiRequest.cpp | 4 +- iRODS/lib/core/src/putUtil.cpp | 8 +- iRODS/lib/core/src/rcConnect.cpp | 6 +- iRODS/lib/core/src/rcMisc.cpp | 4 +- iRODS/lib/core/src/rcPortalOpr.cpp | 2 +- iRODS/lib/core/src/regUtil.cpp | 6 +- iRODS/lib/core/src/replUtil.cpp | 6 +- iRODS/lib/core/src/rmUtil.cpp | 6 +- iRODS/lib/core/src/rmtrashUtil.cpp | 6 +- iRODS/lib/core/src/rodsLog.cpp.src | 5 +- iRODS/lib/core/src/rodsPath.cpp | 6 +- iRODS/lib/core/src/rsyncUtil.cpp | 6 +- iRODS/lib/core/src/scanUtil.cpp | 6 +- iRODS/lib/core/src/sockComm.cpp | 4 +- iRODS/lib/core/src/sslSockComm.cpp | 4 +- iRODS/lib/core/src/stringOpr.cpp | 6 +- iRODS/lib/core/src/trimUtil.cpp | 6 +- iRODS/lib/fortran/src/fortran_io.cpp | 2 +- iRODS/lib/hasher/include/checksum.hpp | 2 +- iRODS/lib/hasher/src/Hasher.cpp | 3 +- iRODS/lib/hasher/src/checksum.cpp | 6 +- iRODS/lib/hasher/src/irods_hasher_factory.cpp | 2 +- iRODS/lib/isio/src/isio.cpp | 2 +- iRODS/lib/rbudp/src/QUANTAnet_rbudpBase_c.cpp | 2 +- .../lib/rbudp/src/QUANTAnet_rbudpSender_c.cpp | 4 +- iRODS/lib/test/src/l1rm.cpp | 2 +- iRODS/lib/test/src/l1test.cpp | 2 +- iRODS/lib/test/src/l3structFile.cpp | 2 +- iRODS/lib/test/src/listcoll.cpp | 2 +- iRODS/lib/test/src/lowlevtest.cpp | 2 +- iRODS/lib/test/src/luketest.cpp | 2 +- iRODS/lib/test/src/packtest.cpp | 2 +- iRODS/lib/test/src/phptest.cpp | 2 +- iRODS/lib/test/src/testrule.cpp | 2 +- iRODS/lib/test/src/xmltest.cpp | 2 +- iRODS/lib/test/src/xmsgtest.cpp | 2 +- iRODS/scripts/perl/updateRodsLog.pl | 4 +- iRODS/server/api/src/rsClientHints.cpp | 2 +- iRODS/server/api/src/rsCollCreate.cpp | 2 +- iRODS/server/api/src/rsCollRepl.cpp | 2 +- iRODS/server/api/src/rsDataObjClose.cpp | 2 +- iRODS/server/api/src/rsDataObjCopy.cpp | 2 +- iRODS/server/api/src/rsDataObjCreate.cpp | 2 +- .../server/api/src/rsDataObjCreateAndStat.cpp | 2 +- iRODS/server/api/src/rsDataObjGet.cpp | 2 +- iRODS/server/api/src/rsDataObjLock.cpp | 2 +- iRODS/server/api/src/rsDataObjLseek.cpp | 2 +- iRODS/server/api/src/rsDataObjOpen.cpp | 2 +- iRODS/server/api/src/rsDataObjOpenAndStat.cpp | 2 +- iRODS/server/api/src/rsDataObjPhymv.cpp | 2 +- iRODS/server/api/src/rsDataObjPut.cpp | 2 +- iRODS/server/api/src/rsDataObjRead.cpp | 2 +- iRODS/server/api/src/rsDataObjRepl.cpp | 2 +- iRODS/server/api/src/rsDataObjTrim.cpp | 2 +- iRODS/server/api/src/rsDataObjTruncate.cpp | 2 +- iRODS/server/api/src/rsDataObjUnlink.cpp | 2 +- iRODS/server/api/src/rsDataObjWrite.cpp | 2 +- iRODS/server/api/src/rsDataPut.cpp | 2 +- iRODS/server/api/src/rsExecCmd.cpp | 2 +- iRODS/server/api/src/rsGetHostForGet.cpp | 2 +- iRODS/server/api/src/rsGetHostForPut.cpp | 2 +- iRODS/server/api/src/rsGetRemoteZoneResc.cpp | 2 +- iRODS/server/api/src/rsIESClientHints.cpp | 2 +- iRODS/server/api/src/rsL3FileGetSingleBuf.cpp | 2 +- iRODS/server/api/src/rsL3FilePutSingleBuf.cpp | 2 +- iRODS/server/api/src/rsObjStat.cpp | 2 +- iRODS/server/api/src/rsPamAuthRequest.cpp | 1 + iRODS/server/api/src/rsPhyPathReg.cpp | 2 +- iRODS/server/api/src/rsProcStat.cpp | 2 +- iRODS/server/api/src/rsServerReport.cpp | 2 +- .../server/api/src/rsStructFileExtAndReg.cpp | 2 +- iRODS/server/api/src/rsSyncMountedColl.cpp | 2 +- iRODS/server/api/src/rsZoneReport.cpp | 2 +- iRODS/server/core/include/collection.hpp | 6 +- iRODS/server/core/include/dataObjOpr.hpp | 6 +- iRODS/server/core/include/irodsReServer.hpp | 10 +- iRODS/server/core/include/irodsXmsgServer.hpp | 10 +- .../server/core/include/irods_data_object.hpp | 2 +- .../core/include/irods_database_object.hpp | 2 +- .../core/include/irods_database_types.hpp | 2 +- .../core/include/irods_resource_manager.hpp | 2 +- .../core/include/irods_server_api_call.hpp | 2 +- iRODS/server/core/include/miscServerFunct.hpp | 6 +- iRODS/server/core/include/objDesc.hpp | 6 +- iRODS/server/core/include/objMetaOpr.hpp | 6 +- iRODS/server/core/include/physPath.hpp | 6 +- iRODS/server/core/include/reServerLib.hpp | 6 +- .../server/core/include/readServerConfig.hpp | 2 +- iRODS/server/core/include/resource.hpp | 6 +- iRODS/server/core/include/rodsAgent.hpp | 10 +- iRODS/server/core/include/rodsConnect.h | 2 +- iRODS/server/core/include/rodsServer.hpp | 10 +- iRODS/server/core/include/rsApiHandler.hpp | 2 +- iRODS/server/core/include/rsGlobal.hpp | 2 +- iRODS/server/core/include/rsGlobalExtern.hpp | 2 +- iRODS/server/core/include/rsIcatOpr.hpp | 4 +- iRODS/server/core/include/rsLog.hpp | 2 +- iRODS/server/core/include/specColl.hpp | 6 +- iRODS/server/core/include/xmsgLib.hpp | 12 +- iRODS/server/core/src/collection.cpp | 2 +- iRODS/server/core/src/dataObjOpr.cpp | 2 +- .../core/src/irods_resource_redirect.cpp | 2 +- .../core/src/irods_server_control_plane.cpp | 2 +- iRODS/server/core/src/irods_server_state.cpp | 2 +- iRODS/server/core/src/miscServerFunct.cpp | 2 +- iRODS/server/core/src/objDesc.cpp | 2 +- iRODS/server/core/src/objMetaOpr.cpp | 2 +- iRODS/server/core/src/physPath.cpp | 2 +- iRODS/server/core/src/reServerLib.cpp | 2 +- iRODS/server/core/src/rodsAgent.cpp | 1 + iRODS/server/core/src/rsApiHandler.cpp | 2 +- iRODS/server/core/src/specColl.cpp | 2 +- iRODS/server/drivers/include/fileDriver.hpp | 6 +- .../icat/include/icatHighLevelRoutines.hpp | 4 +- iRODS/server/re/include/datetime.hpp | 2 +- ...irods_operation_rule_execution_manager.hpp | 2 +- iRODS/server/re/include/msiHelper.hpp | 2 +- iRODS/server/re/include/parser.hpp | 2 +- iRODS/server/re/include/reAction.hpp | 6 +- iRODS/server/re/include/reDataObjOpr.hpp | 2 +- iRODS/server/re/include/reGlobalsExtern.hpp | 8 +- iRODS/server/re/include/reIn2p3SysRule.hpp | 10 +- iRODS/server/re/include/reNaraMetaData.hpp | 2 +- iRODS/server/re/include/reSysDataObjOpr.hpp | 2 +- iRODS/server/re/include/reVariables.hpp | 6 +- iRODS/server/re/include/restructs.hpp | 2 +- iRODS/server/re/include/utils.hpp | 4 +- .../src/WhatToDoWhenYouChangeREIStructure.txt | 2 +- iRODS/server/re/src/conversion.cpp | 2 +- iRODS/server/re/src/functions.cpp | 2 +- iRODS/server/re/src/nre.systemMS.cpp | 2 +- iRODS/server/re/src/reIn2p3SysRule.cpp | 2 +- iRODS/server/re/src/xmsgMS.cpp | 2 +- iRODS/server/test/src/TestBase.hpp | 2 +- iRODS/server/test/src/TestCHL.cpp | 6 +- iRODS/server/test/src/test_chl.cpp | 6 +- iRODS/server/test/src/test_cll.cpp | 2 +- iRODS/server/test/src/test_rda.cpp | 2 +- packaging/irods-dev.list.template | 30 +++++ packaging/irods.list.template | 1 - plugins/api/src/helloworld.cpp | 2 +- plugins/auth/native/libnative.cpp | 2 +- plugins/auth/osauth/libosauth.cpp | 5 +- plugins/auth/pam/libpam.cpp | 4 +- plugins/database/include/low_level_odbc.hpp | 2 +- plugins/database/include/low_level_oracle.hpp | 2 +- plugins/database/include/mid_level.hpp | 2 +- plugins/database/src/db_plugin.cpp | 5 +- plugins/database/src/general_query.cpp | 2 +- plugins/database/src/general_query_setup.cpp | 2 +- plugins/database/src/general_update.cpp | 2 +- plugins/database/src/irods_sql_logger.cpp | 2 +- plugins/database/src/irods_zone_info.cpp | 2 +- plugins/database/src/test_cll.cpp | 2 +- plugins/database/src/test_genq.cpp | 2 +- plugins/database/src/test_genu.cpp | 2 +- .../msiobjget_http/libmsiobjget_http.cpp | 2 +- .../msiobjget_irods/libmsiobjget_irods.cpp | 4 +- .../msiobjget_slink/libmsiobjget_slink.cpp | 4 +- .../msiobjput_http/libmsiobjput_http.cpp | 2 +- .../msiobjput_irods/libmsiobjput_irods.cpp | 4 +- .../msiobjput_slink/libmsiobjput_slink.cpp | 4 +- plugins/network/ssl/libssl.cpp | 4 +- plugins/network/tcp/libtcp.cpp | 4 +- .../resources/mockarchive/libmockarchive.cpp | 2 +- plugins/resources/mso/libmso.cpp | 2 +- .../resources/nonblocking/libnonblocking.cpp | 2 +- plugins/resources/replication/librepl.cpp | 2 +- .../unixfilesystem/libunixfilesystem.cpp | 2 +- 479 files changed, 1352 insertions(+), 1355 deletions(-) rename iRODS/lib/api/include/{apiNumber.hpp => apiNumber.h} (98%) rename iRODS/lib/api/include/{dataObjInpOut.hpp => dataObjInpOut.h} (98%) rename iRODS/lib/api/include/{objStat.hpp => objStat.h} (93%) rename iRODS/lib/core/include/{getRodsEnv.hpp => getRodsEnv.h} (96%) rename iRODS/lib/core/include/{guiProgressCallback.hpp => guiProgressCallback.h} (90%) rename iRODS/lib/core/include/{obf.hpp => obf.h} (96%) rename iRODS/lib/core/include/{objInfo.hpp => objInfo.h} (98%) rename iRODS/lib/core/include/{osauth.hpp => osauth.h} (93%) rename iRODS/lib/core/include/{parseCommandLine.hpp => parseCommandLine.h} (93%) rename iRODS/lib/core/include/{procApiRequest.hpp => procApiRequest.h} (91%) rename iRODS/lib/core/include/{rcConnect.hpp => rcConnect.h} (95%) create mode 100644 iRODS/lib/core/include/rods.h delete mode 100644 iRODS/lib/core/include/rods.hpp rename iRODS/lib/core/include/{rodsClient.hpp => rodsClient.h} (85%) rename iRODS/lib/core/include/{rodsError.hpp => rodsError.h} (87%) rename iRODS/lib/core/include/{rodsErrorTable.hpp => rodsErrorTable.h} (99%) rename iRODS/lib/core/include/{rodsGenQuery.hpp => rodsGenQuery.h} (99%) rename iRODS/lib/core/include/{rodsKeyWdDef.hpp => rodsKeyWdDef.h} (99%) rename iRODS/lib/core/include/{rodsLog.hpp => rodsLog.h} (96%) rename iRODS/lib/core/include/{rodsPackInstruct.hpp => rodsPackInstruct.h} (99%) rename iRODS/lib/core/include/{rodsPath.hpp => rodsPath.h} (82%) rename iRODS/lib/core/include/{rodsQuota.hpp => rodsQuota.h} (85%) rename iRODS/lib/core/include/{rodsType.hpp => rodsType.h} (97%) rename iRODS/lib/core/include/{rodsUser.hpp => rodsUser.h} (96%) rename iRODS/lib/core/include/{rodsVersion.hpp.template => rodsVersion.h.template} (75%) create mode 100644 iRODS/lib/core/include/rodsXmsg.h delete mode 100644 iRODS/lib/core/include/rodsXmsg.hpp rename iRODS/lib/core/include/{sockComm.hpp => sockComm.h} (96%) rename iRODS/lib/core/include/{sslSockComm.hpp => sslSockComm.h} (90%) rename iRODS/lib/core/include/{stringOpr.hpp => stringOpr.h} (93%) diff --git a/.gitignore b/.gitignore index 021578fd7c..aa97fb5ed5 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ iRODS/config/platform.mk iRODS/lib/core/include/irods_plugin_home_directory.hpp iRODS/lib/core/include/irods_home_directory.hpp iRODS/lib/core/include/server_control_plane_command.hpp -iRODS/lib/core/include/rodsVersion.hpp +iRODS/lib/core/include/rodsVersion.h iRODS/lib/core/src/rodsLog.cpp iRODS/server/config/server.config iRODS/server/config/lockFileDir/.gitignore diff --git a/docs/Admin_Guide.md b/docs/Admin_Guide.md index 7c2544a76d..6b739aa13f 100644 --- a/docs/Admin_Guide.md +++ b/docs/Admin_Guide.md @@ -721,7 +721,7 @@ network_write_body #### Available Values within Dynamic PEPs -The following Key-Value Pairs are made available within the running context of each dynamic policy enforcement point (PEP) based both on the plugin type as well as the first class object of interest. They are available via the rule engine in the form of `$KVPairs.VARIABLE_NAME` and are originally defined in `iRODS/lib/core/include/rodsKeyWdDef.hpp`. +The following Key-Value Pairs are made available within the running context of each dynamic policy enforcement point (PEP) based both on the plugin type as well as the first class object of interest. They are available via the rule engine in the form of `$KVPairs.VARIABLE_NAME` and are originally defined in `iRODS/lib/core/include/rodsKeyWdDef.h`. diff --git a/examples/resources/libexamplefilesystem.cpp b/examples/resources/libexamplefilesystem.cpp index e721968afe..7a2cce329d 100644 --- a/examples/resources/libexamplefilesystem.cpp +++ b/examples/resources/libexamplefilesystem.cpp @@ -2,7 +2,7 @@ // irods includes #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "readServerConfig.hpp" #include "miscServerFunct.hpp" diff --git a/iRODS/clients/c_api_test/test.c b/iRODS/clients/c_api_test/test.c index 0b9b2cf657..5d130cb6b5 100644 --- a/iRODS/clients/c_api_test/test.c +++ b/iRODS/clients/c_api_test/test.c @@ -3,12 +3,12 @@ // This test keeps C++ out // Or it breaks the build -#include "rodsType.hpp" -#include "rodsErrorTable.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsType.h" +#include "rodsClient.h" #include "miscUtil.hpp" -#include "rodsPath.hpp" -#include "rcConnect.hpp" +#include "rodsPath.h" +#include "rcConnect.h" #include "dataObjOpen.hpp" #include "dataObjRead.hpp" #include "dataObjChksum.hpp" diff --git a/iRODS/clients/fuse/include/iFuseLib.hpp b/iRODS/clients/fuse/include/iFuseLib.hpp index 6d94da3746..eb28418c64 100644 --- a/iRODS/clients/fuse/include/iFuseLib.hpp +++ b/iRODS/clients/fuse/include/iFuseLib.hpp @@ -5,8 +5,8 @@ #ifndef I_FUSE_LIB_HPP_ #define I_FUSE_LIB_HPP_ -#include "rodsClient.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "rodsPath.h" #include "reFuncDefs.hpp" #define CACHE_FUSE_PATH 1 diff --git a/iRODS/clients/fuse/include/iFuseOper.hpp b/iRODS/clients/fuse/include/iFuseOper.hpp index ce53b1fb63..7f224d5c90 100644 --- a/iRODS/clients/fuse/include/iFuseOper.hpp +++ b/iRODS/clients/fuse/include/iFuseOper.hpp @@ -6,8 +6,8 @@ #define I_FUSE_OPER_HPP_ #include -#include "rodsClient.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "rodsPath.h" #include "iFuseLib.hpp" #include "iFuseLib.Lock.hpp" diff --git a/iRODS/clients/fuse/include/irodsFs.hpp b/iRODS/clients/fuse/include/irodsFs.hpp index 81448766d3..7bb3039b14 100644 --- a/iRODS/clients/fuse/include/irodsFs.hpp +++ b/iRODS/clients/fuse/include/irodsFs.hpp @@ -18,9 +18,9 @@ #define FUSE_USE_VERSION 26 #include -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #define FILE_BLOCK_SZ 512 #define DIR_SZ 4096 diff --git a/iRODS/clients/fuse/src/iFuseLib.FileCache.cpp b/iRODS/clients/fuse/src/iFuseLib.FileCache.cpp index 8f4581661e..be92fe5341 100644 --- a/iRODS/clients/fuse/src/iFuseLib.FileCache.cpp +++ b/iRODS/clients/fuse/src/iFuseLib.FileCache.cpp @@ -10,7 +10,7 @@ #include "iFuseOper.hpp" #include "hashtable.hpp" #include "list.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include "iFuseLib.Lock.hpp" /* Hashtable *NewlyCreatedFileTable; */ diff --git a/iRODS/clients/fuse/src/iFuseOper.cpp b/iRODS/clients/fuse/src/iFuseOper.cpp index 687dc56e42..482a375381 100644 --- a/iRODS/clients/fuse/src/iFuseOper.cpp +++ b/iRODS/clients/fuse/src/iFuseOper.cpp @@ -9,7 +9,7 @@ #include "irodsFs.hpp" #include "iFuseOper.hpp" #include "miscUtil.hpp" -#include "sockComm.hpp" +#include "sockComm.h" PathCacheTable *pctable = initPathCache(); diff --git a/iRODS/clients/fuse/src/irodsFs.cpp b/iRODS/clients/fuse/src/irodsFs.cpp index 2aec4d95ef..e15aa0ac96 100644 --- a/iRODS/clients/fuse/src/irodsFs.cpp +++ b/iRODS/clients/fuse/src/irodsFs.cpp @@ -14,7 +14,7 @@ #include "irodsFs.hpp" #include "iFuseOper.hpp" #include "iFuseLib.hpp" -#include "rodsVersion.hpp" +#include "rodsVersion.h" /* some global variables */ diff --git a/iRODS/clients/icommands/src/genOSAuth.cpp b/iRODS/clients/icommands/src/genOSAuth.cpp index 05cd22c694..f5534138f2 100644 --- a/iRODS/clients/icommands/src/genOSAuth.cpp +++ b/iRODS/clients/icommands/src/genOSAuth.cpp @@ -8,7 +8,8 @@ #include #include -#include "rodsClient.hpp" +#include "rodsClient.h" +#include "osauth.h" int diff --git a/iRODS/clients/icommands/src/iadmin.cpp b/iRODS/clients/icommands/src/iadmin.cpp index 2f028ce03b..7761e51411 100644 --- a/iRODS/clients/icommands/src/iadmin.cpp +++ b/iRODS/clients/icommands/src/iadmin.cpp @@ -5,8 +5,8 @@ Initial version of an administrator interface */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include "irods_string_tokenize.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iapitest.cpp b/iRODS/clients/icommands/src/iapitest.cpp index b2a5f9d2d9..1f67a4f144 100644 --- a/iRODS/clients/icommands/src/iapitest.cpp +++ b/iRODS/clients/icommands/src/iapitest.cpp @@ -3,9 +3,9 @@ */ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "lsUtil.hpp" #include "irods_buffer_encryption.hpp" #include diff --git a/iRODS/clients/icommands/src/ibun.cpp b/iRODS/clients/icommands/src/ibun.cpp index 0ae5e9a6ef..3a14393d1e 100644 --- a/iRODS/clients/icommands/src/ibun.cpp +++ b/iRODS/clients/icommands/src/ibun.cpp @@ -5,9 +5,9 @@ */ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "bunUtil.hpp" void usage(); diff --git a/iRODS/clients/icommands/src/icd.cpp b/iRODS/clients/icommands/src/icd.cpp index d9a9d83838..1b4f847977 100644 --- a/iRODS/clients/icommands/src/icd.cpp +++ b/iRODS/clients/icommands/src/icd.cpp @@ -1,13 +1,13 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ #include -#include "rods.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rods.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "miscUtil.hpp" #include "rcMisc.hpp" #include "genQuery.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ichksum.cpp b/iRODS/clients/icommands/src/ichksum.cpp index dcb85ef240..3b43225937 100644 --- a/iRODS/clients/icommands/src/ichksum.cpp +++ b/iRODS/clients/icommands/src/ichksum.cpp @@ -4,9 +4,9 @@ * ichksum - The irods chksum utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "chksumUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ichmod.cpp b/iRODS/clients/icommands/src/ichmod.cpp index f671f40d30..b09eb83cb8 100644 --- a/iRODS/clients/icommands/src/ichmod.cpp +++ b/iRODS/clients/icommands/src/ichmod.cpp @@ -4,9 +4,9 @@ * ichmod - The irods chmod utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/icp.cpp b/iRODS/clients/icommands/src/icp.cpp index 8829b290ab..ec0c89247e 100644 --- a/iRODS/clients/icommands/src/icp.cpp +++ b/iRODS/clients/icommands/src/icp.cpp @@ -4,9 +4,9 @@ * icp - The irods cp utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "cpUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/idbug.cpp b/iRODS/clients/icommands/src/idbug.cpp index f010f94676..9259ce2eb0 100644 --- a/iRODS/clients/icommands/src/idbug.cpp +++ b/iRODS/clients/icommands/src/idbug.cpp @@ -3,7 +3,7 @@ /* idbug.c - debug rule execution with single stepping across micro-services */ #include -#include "rodsClient.hpp" +#include "rodsClient.h" #include diff --git a/iRODS/clients/icommands/src/ienv.cpp b/iRODS/clients/icommands/src/ienv.cpp index f13e26b3f4..f0154222e6 100644 --- a/iRODS/clients/icommands/src/ienv.cpp +++ b/iRODS/clients/icommands/src/ienv.cpp @@ -4,8 +4,8 @@ * ienv - The irods print environment utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" void usage(); diff --git a/iRODS/clients/icommands/src/ierror.cpp b/iRODS/clients/icommands/src/ierror.cpp index 57d5453682..65a10915cf 100644 --- a/iRODS/clients/icommands/src/ierror.cpp +++ b/iRODS/clients/icommands/src/ierror.cpp @@ -1,7 +1,7 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rods.hpp" -#include "parseCommandLine.hpp" +#include "rods.h" +#include "parseCommandLine.h" #include "rcMisc.hpp" void usage( char *prog ); diff --git a/iRODS/clients/icommands/src/iexecmd.cpp b/iRODS/clients/icommands/src/iexecmd.cpp index 92b68467a9..85bf18d410 100644 --- a/iRODS/clients/icommands/src/iexecmd.cpp +++ b/iRODS/clients/icommands/src/iexecmd.cpp @@ -2,9 +2,9 @@ * iexecmd - The irods utility to execute user composed rules. */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iexit.cpp b/iRODS/clients/icommands/src/iexit.cpp index 53a305aa79..a6cd2cb6fb 100644 --- a/iRODS/clients/icommands/src/iexit.cpp +++ b/iRODS/clients/icommands/src/iexit.cpp @@ -1,7 +1,7 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rods.hpp" -#include "parseCommandLine.hpp" +#include "rods.h" +#include "parseCommandLine.h" #include "rcMisc.hpp" void usage( char *prog ); diff --git a/iRODS/clients/icommands/src/ifsck.cpp b/iRODS/clients/icommands/src/ifsck.cpp index bf8fa653c2..4add42c9d1 100644 --- a/iRODS/clients/icommands/src/ifsck.cpp +++ b/iRODS/clients/icommands/src/ifsck.cpp @@ -3,9 +3,9 @@ /* Written by Jean-Yves Nief of CCIN2P3 and copyright assigned to Data Intensive Cyberinfrastructure Foundation */ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "fsckUtil.hpp" void usage(); diff --git a/iRODS/clients/icommands/src/iget.cpp b/iRODS/clients/icommands/src/iget.cpp index 4f707f7b59..ca6806402a 100644 --- a/iRODS/clients/icommands/src/iget.cpp +++ b/iRODS/clients/icommands/src/iget.cpp @@ -4,9 +4,9 @@ * iget - The irods get utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "getUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/igroupadmin.cpp b/iRODS/clients/icommands/src/igroupadmin.cpp index 2ee0f8be72..4183ecb54d 100644 --- a/iRODS/clients/icommands/src/igroupadmin.cpp +++ b/iRODS/clients/icommands/src/igroupadmin.cpp @@ -1,8 +1,8 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ihelp.cpp b/iRODS/clients/icommands/src/ihelp.cpp index 832316fcd3..c7ec0d9c94 100644 --- a/iRODS/clients/icommands/src/ihelp.cpp +++ b/iRODS/clients/icommands/src/ihelp.cpp @@ -4,8 +4,8 @@ A simple program to provide intro help to the icommands */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include const char * const icmds[] = { diff --git a/iRODS/clients/icommands/src/iinit.cpp b/iRODS/clients/icommands/src/iinit.cpp index 046e3c48ec..7cdec682c4 100644 --- a/iRODS/clients/icommands/src/iinit.cpp +++ b/iRODS/clients/icommands/src/iinit.cpp @@ -2,10 +2,10 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" -#include "parseCommandLine.hpp" +#include "rods.h" +#include "parseCommandLine.h" #include "rcMisc.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" // =-=-=-=-=-=-=- #include "irods_native_auth_object.hpp" diff --git a/iRODS/clients/icommands/src/ils.cpp b/iRODS/clients/icommands/src/ils.cpp index 2e1ce724d0..b3954294b8 100644 --- a/iRODS/clients/icommands/src/ils.cpp +++ b/iRODS/clients/icommands/src/ils.cpp @@ -2,9 +2,9 @@ * ils - The irods ls utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "lsUtil.hpp" diff --git a/iRODS/clients/icommands/src/ilsresc.cpp b/iRODS/clients/icommands/src/ilsresc.cpp index 761711ec6b..301dd41199 100644 --- a/iRODS/clients/icommands/src/ilsresc.cpp +++ b/iRODS/clients/icommands/src/ilsresc.cpp @@ -5,8 +5,8 @@ This is a regular-user level utility to list the resources. */ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #include "irods_children_parser.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/imcoll.cpp b/iRODS/clients/icommands/src/imcoll.cpp index 96398ae947..74914d212f 100644 --- a/iRODS/clients/icommands/src/imcoll.cpp +++ b/iRODS/clients/icommands/src/imcoll.cpp @@ -7,9 +7,9 @@ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "mcollUtil.hpp" void usage(); diff --git a/iRODS/clients/icommands/src/imeta.cpp b/iRODS/clients/icommands/src/imeta.cpp index 0806a87c95..67b8997c6d 100644 --- a/iRODS/clients/icommands/src/imeta.cpp +++ b/iRODS/clients/icommands/src/imeta.cpp @@ -5,8 +5,8 @@ This is an interface to the Attribute-Value-Units type of metadata. */ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/imiscsvrinfo.cpp b/iRODS/clients/icommands/src/imiscsvrinfo.cpp index 04d156cf8b..aa69881c4f 100644 --- a/iRODS/clients/icommands/src/imiscsvrinfo.cpp +++ b/iRODS/clients/icommands/src/imiscsvrinfo.cpp @@ -5,8 +5,8 @@ Tests connecting to the server. */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/imkdir.cpp b/iRODS/clients/icommands/src/imkdir.cpp index 5e13191363..4141d68d67 100644 --- a/iRODS/clients/icommands/src/imkdir.cpp +++ b/iRODS/clients/icommands/src/imkdir.cpp @@ -4,9 +4,9 @@ * imkdir - The irods mkdir utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "mkdirUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/imv.cpp b/iRODS/clients/icommands/src/imv.cpp index 74bb76d6ab..a44462a45f 100644 --- a/iRODS/clients/icommands/src/imv.cpp +++ b/iRODS/clients/icommands/src/imv.cpp @@ -4,9 +4,9 @@ * imv - The irods mv utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "mvUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ipasswd.cpp b/iRODS/clients/icommands/src/ipasswd.cpp index 7c6a522c44..5e37e4d316 100644 --- a/iRODS/clients/icommands/src/ipasswd.cpp +++ b/iRODS/clients/icommands/src/ipasswd.cpp @@ -2,8 +2,8 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* User command to change their password. */ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #include #include #include "irods_client_api_table.hpp" diff --git a/iRODS/clients/icommands/src/iphybun.cpp b/iRODS/clients/icommands/src/iphybun.cpp index 76b7a0afaf..c19231642e 100644 --- a/iRODS/clients/icommands/src/iphybun.cpp +++ b/iRODS/clients/icommands/src/iphybun.cpp @@ -5,9 +5,9 @@ */ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "phybunUtil.hpp" void usage(); diff --git a/iRODS/clients/icommands/src/iphymv.cpp b/iRODS/clients/icommands/src/iphymv.cpp index 873f806f67..cbbf4d9cce 100644 --- a/iRODS/clients/icommands/src/iphymv.cpp +++ b/iRODS/clients/icommands/src/iphymv.cpp @@ -4,9 +4,9 @@ * iphymv - The irods physical move utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "phymvUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ips.cpp b/iRODS/clients/icommands/src/ips.cpp index 747aa7973f..9aadbad586 100644 --- a/iRODS/clients/icommands/src/ips.cpp +++ b/iRODS/clients/icommands/src/ips.cpp @@ -4,8 +4,8 @@ ips.c - Command to get the stat of irods agents running in the federation.. */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iput.cpp b/iRODS/clients/icommands/src/iput.cpp index 9a2a6334c6..f9208bee58 100644 --- a/iRODS/clients/icommands/src/iput.cpp +++ b/iRODS/clients/icommands/src/iput.cpp @@ -4,9 +4,9 @@ * iput - The irods put utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "putUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ipwd.cpp b/iRODS/clients/icommands/src/ipwd.cpp index 2f0c0096ba..578065c66e 100644 --- a/iRODS/clients/icommands/src/ipwd.cpp +++ b/iRODS/clients/icommands/src/ipwd.cpp @@ -1,7 +1,7 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rods.hpp" -#include "parseCommandLine.hpp" +#include "rods.h" +#include "parseCommandLine.h" #include "rcMisc.hpp" void usage( char *prog ); diff --git a/iRODS/clients/icommands/src/iqdel.cpp b/iRODS/clients/icommands/src/iqdel.cpp index 796b5cbd1d..1fed9bf746 100644 --- a/iRODS/clients/icommands/src/iqdel.cpp +++ b/iRODS/clients/icommands/src/iqdel.cpp @@ -5,8 +5,8 @@ A user interface for deleting delayed execution rules */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iqmod.cpp b/iRODS/clients/icommands/src/iqmod.cpp index 58b0d60435..50975951c7 100644 --- a/iRODS/clients/icommands/src/iqmod.cpp +++ b/iRODS/clients/icommands/src/iqmod.cpp @@ -6,8 +6,8 @@ in delayed execution rules. */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iqstat.cpp b/iRODS/clients/icommands/src/iqstat.cpp index a7afbc36fc..7e4543d5e5 100644 --- a/iRODS/clients/icommands/src/iqstat.cpp +++ b/iRODS/clients/icommands/src/iqstat.cpp @@ -5,8 +5,8 @@ This is an interface to the Attribute-Value-Units type of metadata. */ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iquest.cpp b/iRODS/clients/icommands/src/iquest.cpp index 5d040b51d2..f27146bce1 100644 --- a/iRODS/clients/icommands/src/iquest.cpp +++ b/iRODS/clients/icommands/src/iquest.cpp @@ -2,9 +2,9 @@ * iquest - The irods iquest (question (query)) utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "rcMisc.hpp" #include "lsUtil.hpp" #include diff --git a/iRODS/clients/icommands/src/iquota.cpp b/iRODS/clients/icommands/src/iquota.cpp index d3d1ded64e..c710ef47f1 100644 --- a/iRODS/clients/icommands/src/iquota.cpp +++ b/iRODS/clients/icommands/src/iquota.cpp @@ -5,8 +5,8 @@ User interface to display quota information. */ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ireg.cpp b/iRODS/clients/icommands/src/ireg.cpp index 7a4936c5f1..692b52a33a 100644 --- a/iRODS/clients/icommands/src/ireg.cpp +++ b/iRODS/clients/icommands/src/ireg.cpp @@ -4,9 +4,9 @@ * ireg - The irods reg utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "regUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/irepl.cpp b/iRODS/clients/icommands/src/irepl.cpp index 0e1fc94636..9b3053349e 100644 --- a/iRODS/clients/icommands/src/irepl.cpp +++ b/iRODS/clients/icommands/src/irepl.cpp @@ -4,9 +4,9 @@ * irepl - The irods repl utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "replUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/irm.cpp b/iRODS/clients/icommands/src/irm.cpp index d899e4df90..4fce071382 100644 --- a/iRODS/clients/icommands/src/irm.cpp +++ b/iRODS/clients/icommands/src/irm.cpp @@ -4,9 +4,9 @@ * irm - The irods rm utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "rmUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/irmtrash.cpp b/iRODS/clients/icommands/src/irmtrash.cpp index ce173f28aa..2090c8e951 100644 --- a/iRODS/clients/icommands/src/irmtrash.cpp +++ b/iRODS/clients/icommands/src/irmtrash.cpp @@ -4,9 +4,9 @@ * irmtrash - The irods rmtrash utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "rmtrashUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/irods-grid.cpp b/iRODS/clients/icommands/src/irods-grid.cpp index 3d2e855f83..c2841702f3 100644 --- a/iRODS/clients/icommands/src/irods-grid.cpp +++ b/iRODS/clients/icommands/src/irods-grid.cpp @@ -14,7 +14,7 @@ #include "jansson.h" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "irods_server_control_plane.hpp" #include "irods_buffer_encryption.hpp" #include "server_control_plane_command.hpp" diff --git a/iRODS/clients/icommands/src/irsync.cpp b/iRODS/clients/icommands/src/irsync.cpp index f854d61007..cb707206e0 100644 --- a/iRODS/clients/icommands/src/irsync.cpp +++ b/iRODS/clients/icommands/src/irsync.cpp @@ -4,9 +4,9 @@ * irsync - The irods put utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "rsyncUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/irule.cpp b/iRODS/clients/icommands/src/irule.cpp index 3188d1ac66..8015f3cbeb 100644 --- a/iRODS/clients/icommands/src/irule.cpp +++ b/iRODS/clients/icommands/src/irule.cpp @@ -2,9 +2,9 @@ * irule - The irods utility to execute user composed rules. */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "getUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iscan.cpp b/iRODS/clients/icommands/src/iscan.cpp index 6af427c3ee..a519abf45b 100644 --- a/iRODS/clients/icommands/src/iscan.cpp +++ b/iRODS/clients/icommands/src/iscan.cpp @@ -3,9 +3,9 @@ /* Written by Jean-Yves Nief of CCIN2P3 and copyright assigned to Data Intensive Cyberinfrastructure Foundation */ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "scanUtil.hpp" void usage(); diff --git a/iRODS/clients/icommands/src/isysmeta.cpp b/iRODS/clients/icommands/src/isysmeta.cpp index a13f31335a..0367951101 100644 --- a/iRODS/clients/icommands/src/isysmeta.cpp +++ b/iRODS/clients/icommands/src/isysmeta.cpp @@ -1,7 +1,7 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iticket.cpp b/iRODS/clients/icommands/src/iticket.cpp index 198c255691..26a5f5bdd4 100644 --- a/iRODS/clients/icommands/src/iticket.cpp +++ b/iRODS/clients/icommands/src/iticket.cpp @@ -7,8 +7,8 @@ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #define MAX_SQL 300 #define BIG_STR 3000 diff --git a/iRODS/clients/icommands/src/itrim.cpp b/iRODS/clients/icommands/src/itrim.cpp index 77dcbe1817..ddf8117987 100644 --- a/iRODS/clients/icommands/src/itrim.cpp +++ b/iRODS/clients/icommands/src/itrim.cpp @@ -4,9 +4,9 @@ * itrim - The irods replica trimming utility */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "trimUtil.hpp" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/iuserinfo.cpp b/iRODS/clients/icommands/src/iuserinfo.cpp index bd63652613..add647825e 100644 --- a/iRODS/clients/icommands/src/iuserinfo.cpp +++ b/iRODS/clients/icommands/src/iuserinfo.cpp @@ -5,8 +5,8 @@ This is an interface to the user information (metadata). */ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" diff --git a/iRODS/clients/icommands/src/ixmsg.cpp b/iRODS/clients/icommands/src/ixmsg.cpp index 12c1626753..704979797d 100644 --- a/iRODS/clients/icommands/src/ixmsg.cpp +++ b/iRODS/clients/icommands/src/ixmsg.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* ixmsg.c - Xmessage communicator */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" #include "irods_configuration_keywords.hpp" diff --git a/iRODS/clients/icommands/src/izonereport.cpp b/iRODS/clients/icommands/src/izonereport.cpp index 8006a4c172..ef51c1c4e3 100644 --- a/iRODS/clients/icommands/src/izonereport.cpp +++ b/iRODS/clients/icommands/src/izonereport.cpp @@ -3,9 +3,9 @@ */ #include "irods_client_api_table.hpp" #include "irods_pack_table.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "lsUtil.hpp" #include "irods_buffer_encryption.hpp" #include "zone_report.hpp" diff --git a/iRODS/clients/icommands/test/misc/i.cpp b/iRODS/clients/icommands/test/misc/i.cpp index 8ed8a52ec2..693aeeaf58 100644 --- a/iRODS/clients/icommands/test/misc/i.cpp +++ b/iRODS/clients/icommands/test/misc/i.cpp @@ -26,8 +26,8 @@ #include -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #define BIG_STR 200 diff --git a/iRODS/clients/icommands/test/misc/iTestGenQuery.cpp b/iRODS/clients/icommands/test/misc/iTestGenQuery.cpp index b5deae18a4..da4d41f8e3 100644 --- a/iRODS/clients/icommands/test/misc/iTestGenQuery.cpp +++ b/iRODS/clients/icommands/test/misc/iTestGenQuery.cpp @@ -11,8 +11,8 @@ Current tests include two queries on ACLs and one that gets object and sorted resource information. */ -#include "rods.hpp" -#include "rodsClient.hpp" +#include "rods.h" +#include "rodsClient.h" void usage( char *prog ); diff --git a/iRODS/lib/Makefile b/iRODS/lib/Makefile index eb8295be67..c705acc5d5 100644 --- a/iRODS/lib/Makefile +++ b/iRODS/lib/Makefile @@ -244,5 +244,5 @@ $(LIB_RBUDP_OBJS): $(libRbudpObjDir)/%.o: $(libRbudpSrcDir)/%.cpp $(configMk) $ rodslog: $(LOG_SRC) @true -$(LOG_SRC): $(libCoreIncDir)/rodsErrorTable.hpp +$(LOG_SRC): $(libCoreIncDir)/rodsErrorTable.h @$(PERL) $(perlScriptsDir)/updateRodsLog.pl diff --git a/iRODS/lib/api/include/apiHeaderAll.hpp b/iRODS/lib/api/include/apiHeaderAll.hpp index 7cf554d1fa..59ecf55bc3 100644 --- a/iRODS/lib/api/include/apiHeaderAll.hpp +++ b/iRODS/lib/api/include/apiHeaderAll.hpp @@ -67,7 +67,7 @@ #include "phyPathReg.hpp" #include "dataObjPhymv.hpp" #include "dataObjTrim.hpp" -#include "objStat.hpp" +#include "objStat.h" #include "execCmd.hpp" #include "subStructFileCreate.hpp" #include "subStructFileOpen.hpp" diff --git a/iRODS/lib/api/include/apiNumber.hpp b/iRODS/lib/api/include/apiNumber.h similarity index 98% rename from iRODS/lib/api/include/apiNumber.hpp rename to iRODS/lib/api/include/apiNumber.h index 751f73a01e..d3be5eb3a7 100644 --- a/iRODS/lib/api/include/apiNumber.hpp +++ b/iRODS/lib/api/include/apiNumber.h @@ -6,8 +6,8 @@ -#ifndef API_NUMBER_HPP -#define API_NUMBER_HPP +#ifndef API_NUMBER_H__ +#define API_NUMBER_H__ /* 500 - 599 - Internal File I/O API calls */ #define FILE_CREATE_AN 500 @@ -159,4 +159,4 @@ #define AUTH_PLUG_RESP_AN 1202 #define GET_HIER_FOR_RESC_AN 1203 -#endif /* API_NUMBER_H */ +#endif // API_NUMBER_H__ diff --git a/iRODS/lib/api/include/apiPackTable.hpp b/iRODS/lib/api/include/apiPackTable.hpp index 6f123b10e5..41a76c346f 100644 --- a/iRODS/lib/api/include/apiPackTable.hpp +++ b/iRODS/lib/api/include/apiPackTable.hpp @@ -6,9 +6,9 @@ #ifndef API_PACK_TABLE_HPP #define API_PACK_TABLE_HPP -#include "rods.hpp" +#include "rods.h" #include "packStruct.hpp" -#include "rodsPackInstruct.hpp" +#include "rodsPackInstruct.h" /* need to include a header for for each API */ #include "apiHeaderAll.hpp" diff --git a/iRODS/lib/api/include/apiTable.hpp b/iRODS/lib/api/include/apiTable.hpp index cd56f47726..03aef8f78c 100644 --- a/iRODS/lib/api/include/apiTable.hpp +++ b/iRODS/lib/api/include/apiTable.hpp @@ -10,10 +10,10 @@ #define API_TABLE_HPP #include "rcMisc.hpp" -#include "rods.hpp" +#include "rods.h" #include "apiHandler.hpp" -#include "apiNumber.hpp" -#include "rodsUser.hpp" +#include "apiNumber.h" +#include "rodsUser.h" diff --git a/iRODS/lib/api/include/authCheck.hpp b/iRODS/lib/api/include/authCheck.hpp index 083ee00c15..f24caa8b68 100644 --- a/iRODS/lib/api/include/authCheck.hpp +++ b/iRODS/lib/api/include/authCheck.hpp @@ -11,10 +11,10 @@ /* This is used by one server to connect to the ICAT-enabled server to verify a user's login */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/authPluginRequest.hpp b/iRODS/lib/api/include/authPluginRequest.hpp index f7a48aab96..66b1e25916 100644 --- a/iRODS/lib/api/include/authPluginRequest.hpp +++ b/iRODS/lib/api/include/authPluginRequest.hpp @@ -3,10 +3,10 @@ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "authRequest.hpp" diff --git a/iRODS/lib/api/include/authRequest.hpp b/iRODS/lib/api/include/authRequest.hpp index b239ae26d8..3b8c99b225 100644 --- a/iRODS/lib/api/include/authRequest.hpp +++ b/iRODS/lib/api/include/authRequest.hpp @@ -8,10 +8,10 @@ /* This is a Metadata API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" #define CHALLENGE_LEN 64 /* 64 bytes of data and terminating null */ diff --git a/iRODS/lib/api/include/authResponse.hpp b/iRODS/lib/api/include/authResponse.hpp index 7ad45a9112..fc0ebe8d02 100644 --- a/iRODS/lib/api/include/authResponse.hpp +++ b/iRODS/lib/api/include/authResponse.hpp @@ -8,10 +8,10 @@ /* This is a Metadata API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/authenticate.hpp b/iRODS/lib/api/include/authenticate.hpp index a788f93f41..3c60ef5e10 100644 --- a/iRODS/lib/api/include/authenticate.hpp +++ b/iRODS/lib/api/include/authenticate.hpp @@ -8,9 +8,9 @@ /* This is a high level file type API call */ -#include "rods.hpp" -//#include "procApiRequest.hpp" -//#include "apiNumber.hpp" +#include "rods.h" +//#include "procApiRequest.h" +//#include "apiNumber.h" //#include "icatDefines.hpp" #define AUTH_SUBOP_REQ_AUTH "request challenge" diff --git a/iRODS/lib/api/include/bulkDataObjPut.hpp b/iRODS/lib/api/include/bulkDataObjPut.hpp index 440561509c..ee44557f2a 100644 --- a/iRODS/lib/api/include/bulkDataObjPut.hpp +++ b/iRODS/lib/api/include/bulkDataObjPut.hpp @@ -8,9 +8,9 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" #include "genQuery.hpp" #define TMP_PHY_BUN_DIR "tmpPhyBunDir" diff --git a/iRODS/lib/api/include/bulkDataObjReg.hpp b/iRODS/lib/api/include/bulkDataObjReg.hpp index 54cd21e683..1672fb950c 100644 --- a/iRODS/lib/api/include/bulkDataObjReg.hpp +++ b/iRODS/lib/api/include/bulkDataObjReg.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" /* definition for opreration type */ #define OPR_TYPE_INX 999999 diff --git a/iRODS/lib/api/include/chkNVPathPerm.hpp b/iRODS/lib/api/include/chkNVPathPerm.hpp index 2731ddb3cd..01aa340b0e 100644 --- a/iRODS/lib/api/include/chkNVPathPerm.hpp +++ b/iRODS/lib/api/include/chkNVPathPerm.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" #ifdef __cplusplus diff --git a/iRODS/lib/api/include/chkObjPermAndStat.hpp b/iRODS/lib/api/include/chkObjPermAndStat.hpp index 9ee90636dd..8470f3baaf 100644 --- a/iRODS/lib/api/include/chkObjPermAndStat.hpp +++ b/iRODS/lib/api/include/chkObjPermAndStat.hpp @@ -8,11 +8,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" /* definition for flags */ #define CHK_COLL_FOR_BUNDLE_OPR 0x1 diff --git a/iRODS/lib/api/include/client_hints.hpp b/iRODS/lib/api/include/client_hints.hpp index 9a0f8f4bba..2636784b75 100644 --- a/iRODS/lib/api/include/client_hints.hpp +++ b/iRODS/lib/api/include/client_hints.hpp @@ -3,10 +3,10 @@ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #define CLIENT_HINTS_AN 10215 diff --git a/iRODS/lib/api/include/closeCollection.hpp b/iRODS/lib/api/include/closeCollection.hpp index ac0b156d43..002ddf0033 100644 --- a/iRODS/lib/api/include/closeCollection.hpp +++ b/iRODS/lib/api/include/closeCollection.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_CLOSE_COLLECTION rsCloseCollection diff --git a/iRODS/lib/api/include/collCreate.hpp b/iRODS/lib/api/include/collCreate.hpp index 2a912628d8..d36dd7767e 100644 --- a/iRODS/lib/api/include/collCreate.hpp +++ b/iRODS/lib/api/include/collCreate.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_COLL_CREATE rsCollCreate diff --git a/iRODS/lib/api/include/collRepl.hpp b/iRODS/lib/api/include/collRepl.hpp index 3d6365cffc..29b008b267 100644 --- a/iRODS/lib/api/include/collRepl.hpp +++ b/iRODS/lib/api/include/collRepl.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" #include "dataCopy.hpp" diff --git a/iRODS/lib/api/include/dataCopy.hpp b/iRODS/lib/api/include/dataCopy.hpp index f98004c3a4..cc17fb779f 100644 --- a/iRODS/lib/api/include/dataCopy.hpp +++ b/iRODS/lib/api/include/dataCopy.hpp @@ -6,11 +6,11 @@ /* This is a high level type API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" -#include "dataObjInpOut.hpp" +#include "dataObjInpOut.h" typedef struct DataCopyInp { dataOprInp_t dataOprInp; diff --git a/iRODS/lib/api/include/dataGet.hpp b/iRODS/lib/api/include/dataGet.hpp index 3674c22055..d0bb2f1e2b 100644 --- a/iRODS/lib/api/include/dataGet.hpp +++ b/iRODS/lib/api/include/dataGet.hpp @@ -6,10 +6,10 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" #include "fileOpen.hpp" #include "dataObjGet.hpp" diff --git a/iRODS/lib/api/include/dataObjChksum.hpp b/iRODS/lib/api/include/dataObjChksum.hpp index c19897c6ca..3eab5e705a 100644 --- a/iRODS/lib/api/include/dataObjChksum.hpp +++ b/iRODS/lib/api/include/dataObjChksum.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "fileChksum.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/dataObjClose.hpp b/iRODS/lib/api/include/dataObjClose.hpp index d63fe98160..a169abc650 100644 --- a/iRODS/lib/api/include/dataObjClose.hpp +++ b/iRODS/lib/api/include/dataObjClose.hpp @@ -8,9 +8,9 @@ /* This is a high level type API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileClose.hpp" #include "fileStat.hpp" diff --git a/iRODS/lib/api/include/dataObjCopy.hpp b/iRODS/lib/api/include/dataObjCopy.hpp index 3b00a8f729..f2fdc4362c 100644 --- a/iRODS/lib/api/include/dataObjCopy.hpp +++ b/iRODS/lib/api/include/dataObjCopy.hpp @@ -14,8 +14,8 @@ /* This is a high level type API call */ #include "rodsConnect.h" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" /** * \var dataObjCopyInp_t diff --git a/iRODS/lib/api/include/dataObjCreate.hpp b/iRODS/lib/api/include/dataObjCreate.hpp index c23a160a8f..e83fbe5c46 100644 --- a/iRODS/lib/api/include/dataObjCreate.hpp +++ b/iRODS/lib/api/include/dataObjCreate.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "fileCreate.hpp" #ifdef __cplusplus diff --git a/iRODS/lib/api/include/dataObjCreateAndStat.hpp b/iRODS/lib/api/include/dataObjCreateAndStat.hpp index b0524b987a..2cade913ba 100644 --- a/iRODS/lib/api/include/dataObjCreateAndStat.hpp +++ b/iRODS/lib/api/include/dataObjCreateAndStat.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "fileCreate.hpp" #include "dataObjOpenAndStat.hpp" diff --git a/iRODS/lib/api/include/dataObjGet.hpp b/iRODS/lib/api/include/dataObjGet.hpp index 40133c7cf8..1d1d508863 100644 --- a/iRODS/lib/api/include/dataObjGet.hpp +++ b/iRODS/lib/api/include/dataObjGet.hpp @@ -8,10 +8,10 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" diff --git a/iRODS/lib/api/include/dataObjInpOut.hpp b/iRODS/lib/api/include/dataObjInpOut.h similarity index 98% rename from iRODS/lib/api/include/dataObjInpOut.hpp rename to iRODS/lib/api/include/dataObjInpOut.h index 9c24ea54d0..b367225027 100644 --- a/iRODS/lib/api/include/dataObjInpOut.hpp +++ b/iRODS/lib/api/include/dataObjInpOut.h @@ -1,5 +1,5 @@ /** - * @file dataObjInpOut.hpp + * @file dataObjInpOut.h * */ @@ -7,8 +7,8 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ -#ifndef DATA_OBJ_INP_OUT_HPP -#define DATA_OBJ_INP_OUT_HPP +#ifndef DATA_OBJ_INP_OUT_H__ +#define DATA_OBJ_INP_OUT_H__ #include "rodsDef.h" @@ -211,4 +211,4 @@ typedef struct TransferHeader { rodsLong_t length; } transferHeader_t; -#endif /* DATA_OBJ_INP_OUT_H */ +#endif /* DATA_OBJ_INP_OUT_H__ */ diff --git a/iRODS/lib/api/include/dataObjLock.hpp b/iRODS/lib/api/include/dataObjLock.hpp index 8aae74f769..8e9b3effe5 100644 --- a/iRODS/lib/api/include/dataObjLock.hpp +++ b/iRODS/lib/api/include/dataObjLock.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" /* lock type definition */ #define READ_LOCK_TYPE "readLockType" diff --git a/iRODS/lib/api/include/dataObjLseek.hpp b/iRODS/lib/api/include/dataObjLseek.hpp index 49a4e72e49..ebed23247d 100644 --- a/iRODS/lib/api/include/dataObjLseek.hpp +++ b/iRODS/lib/api/include/dataObjLseek.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileLseek.hpp" diff --git a/iRODS/lib/api/include/dataObjOpen.hpp b/iRODS/lib/api/include/dataObjOpen.hpp index 3c92702b61..0805188d27 100644 --- a/iRODS/lib/api/include/dataObjOpen.hpp +++ b/iRODS/lib/api/include/dataObjOpen.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "fileOpen.hpp" /* definition for phyOpenFlag */ diff --git a/iRODS/lib/api/include/dataObjOpenAndStat.hpp b/iRODS/lib/api/include/dataObjOpenAndStat.hpp index 3b18c92e8a..7a614b1893 100644 --- a/iRODS/lib/api/include/dataObjOpenAndStat.hpp +++ b/iRODS/lib/api/include/dataObjOpenAndStat.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "fileOpen.hpp" /* This is a Object File I/O call */ diff --git a/iRODS/lib/api/include/dataObjPhymv.hpp b/iRODS/lib/api/include/dataObjPhymv.hpp index a2c69c936b..511a668237 100644 --- a/iRODS/lib/api/include/dataObjPhymv.hpp +++ b/iRODS/lib/api/include/dataObjPhymv.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" #include "dataCopy.hpp" diff --git a/iRODS/lib/api/include/dataObjPut.hpp b/iRODS/lib/api/include/dataObjPut.hpp index f9f1924c9c..52bd47ec78 100644 --- a/iRODS/lib/api/include/dataObjPut.hpp +++ b/iRODS/lib/api/include/dataObjPut.hpp @@ -8,10 +8,10 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" diff --git a/iRODS/lib/api/include/dataObjRead.hpp b/iRODS/lib/api/include/dataObjRead.hpp index 62a36b2ef9..185cf453b2 100644 --- a/iRODS/lib/api/include/dataObjRead.hpp +++ b/iRODS/lib/api/include/dataObjRead.hpp @@ -8,10 +8,10 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileRead.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/dataObjRename.hpp b/iRODS/lib/api/include/dataObjRename.hpp index 74c4bb24f8..cd40bba670 100644 --- a/iRODS/lib/api/include/dataObjRename.hpp +++ b/iRODS/lib/api/include/dataObjRename.hpp @@ -8,9 +8,9 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjCopy.hpp" #ifdef __cplusplus diff --git a/iRODS/lib/api/include/dataObjRepl.hpp b/iRODS/lib/api/include/dataObjRepl.hpp index 6bba211144..c4232484d6 100644 --- a/iRODS/lib/api/include/dataObjRepl.hpp +++ b/iRODS/lib/api/include/dataObjRepl.hpp @@ -8,10 +8,10 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" #include "dataCopy.hpp" diff --git a/iRODS/lib/api/include/dataObjRsync.hpp b/iRODS/lib/api/include/dataObjRsync.hpp index 53f765169f..084784782e 100644 --- a/iRODS/lib/api/include/dataObjRsync.hpp +++ b/iRODS/lib/api/include/dataObjRsync.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" #include "oprComplete.hpp" diff --git a/iRODS/lib/api/include/dataObjTrim.hpp b/iRODS/lib/api/include/dataObjTrim.hpp index 2b31d3a06a..942c092ca5 100644 --- a/iRODS/lib/api/include/dataObjTrim.hpp +++ b/iRODS/lib/api/include/dataObjTrim.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" #include "dataCopy.hpp" diff --git a/iRODS/lib/api/include/dataObjTruncate.hpp b/iRODS/lib/api/include/dataObjTruncate.hpp index d6a238849d..5f7bdc4a58 100644 --- a/iRODS/lib/api/include/dataObjTruncate.hpp +++ b/iRODS/lib/api/include/dataObjTruncate.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "fileTruncate.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/dataObjUnlink.hpp b/iRODS/lib/api/include/dataObjUnlink.hpp index 739e074861..fad6d3185a 100644 --- a/iRODS/lib/api/include/dataObjUnlink.hpp +++ b/iRODS/lib/api/include/dataObjUnlink.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "fileUnlink.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/dataObjWrite.hpp b/iRODS/lib/api/include/dataObjWrite.hpp index b5e0fb701d..5781007df7 100644 --- a/iRODS/lib/api/include/dataObjWrite.hpp +++ b/iRODS/lib/api/include/dataObjWrite.hpp @@ -8,9 +8,9 @@ /* This is a high level type API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileWrite.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/dataPut.hpp b/iRODS/lib/api/include/dataPut.hpp index 2fa860a008..69813759b8 100644 --- a/iRODS/lib/api/include/dataPut.hpp +++ b/iRODS/lib/api/include/dataPut.hpp @@ -6,10 +6,10 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" #include "fileOpen.hpp" #include "dataObjPut.hpp" diff --git a/iRODS/lib/api/include/endTransaction.hpp b/iRODS/lib/api/include/endTransaction.hpp index de25f348cc..15bfbe0924 100644 --- a/iRODS/lib/api/include/endTransaction.hpp +++ b/iRODS/lib/api/include/endTransaction.hpp @@ -11,10 +11,10 @@ /* This is a Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/execCmd.hpp b/iRODS/lib/api/include/execCmd.hpp index 4433b8c6ed..7ab43353db 100644 --- a/iRODS/lib/api/include/execCmd.hpp +++ b/iRODS/lib/api/include/execCmd.hpp @@ -7,9 +7,9 @@ /* This is Object File I/O type API call */ #include "rodsConnect.h" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #define CMD_DIR "cmd" diff --git a/iRODS/lib/api/include/execMyRule.hpp b/iRODS/lib/api/include/execMyRule.hpp index 952f3a94ac..85f0d67ca1 100644 --- a/iRODS/lib/api/include/execMyRule.hpp +++ b/iRODS/lib/api/include/execMyRule.hpp @@ -6,11 +6,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "msParam.hpp" typedef struct ExecMyRuleInp { diff --git a/iRODS/lib/api/include/fileChksum.hpp b/iRODS/lib/api/include/fileChksum.hpp index f241f32851..f706daa6b2 100644 --- a/iRODS/lib/api/include/fileChksum.hpp +++ b/iRODS/lib/api/include/fileChksum.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct FileChksumInp { rodsHostAddr_t addr; diff --git a/iRODS/lib/api/include/fileChmod.hpp b/iRODS/lib/api/include/fileChmod.hpp index b090fc0944..ddf1863875 100644 --- a/iRODS/lib/api/include/fileChmod.hpp +++ b/iRODS/lib/api/include/fileChmod.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct { rodsHostAddr_t addr; diff --git a/iRODS/lib/api/include/fileClose.hpp b/iRODS/lib/api/include/fileClose.hpp index ab37cd8861..0509a063fb 100644 --- a/iRODS/lib/api/include/fileClose.hpp +++ b/iRODS/lib/api/include/fileClose.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct FileCloseInp { int fileInx; diff --git a/iRODS/lib/api/include/fileClosedir.hpp b/iRODS/lib/api/include/fileClosedir.hpp index c8ba888a08..d929b75995 100644 --- a/iRODS/lib/api/include/fileClosedir.hpp +++ b/iRODS/lib/api/include/fileClosedir.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct { int fileInx; diff --git a/iRODS/lib/api/include/fileCreate.hpp b/iRODS/lib/api/include/fileCreate.hpp index f12cd3c6e5..70661526a3 100644 --- a/iRODS/lib/api/include/fileCreate.hpp +++ b/iRODS/lib/api/include/fileCreate.hpp @@ -10,8 +10,8 @@ #include "rodsConnect.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" diff --git a/iRODS/lib/api/include/fileGet.hpp b/iRODS/lib/api/include/fileGet.hpp index 78149a8e67..7def5cc2dc 100644 --- a/iRODS/lib/api/include/fileGet.hpp +++ b/iRODS/lib/api/include/fileGet.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" diff --git a/iRODS/lib/api/include/fileGetFsFreeSpace.hpp b/iRODS/lib/api/include/fileGetFsFreeSpace.hpp index 797484c623..867223f678 100644 --- a/iRODS/lib/api/include/fileGetFsFreeSpace.hpp +++ b/iRODS/lib/api/include/fileGetFsFreeSpace.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct { rodsHostAddr_t addr; diff --git a/iRODS/lib/api/include/fileLseek.hpp b/iRODS/lib/api/include/fileLseek.hpp index d42c61450b..b743c35736 100644 --- a/iRODS/lib/api/include/fileLseek.hpp +++ b/iRODS/lib/api/include/fileLseek.hpp @@ -13,10 +13,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" /** * \var fileLseekInp_t diff --git a/iRODS/lib/api/include/fileMkdir.hpp b/iRODS/lib/api/include/fileMkdir.hpp index 2ad98bce82..f2964b6c55 100644 --- a/iRODS/lib/api/include/fileMkdir.hpp +++ b/iRODS/lib/api/include/fileMkdir.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/fileOpen.hpp b/iRODS/lib/api/include/fileOpen.hpp index 26108c9b33..3340f49fbc 100644 --- a/iRODS/lib/api/include/fileOpen.hpp +++ b/iRODS/lib/api/include/fileOpen.hpp @@ -10,8 +10,8 @@ #include "rodsConnect.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" /* definition for otherFlags */ diff --git a/iRODS/lib/api/include/fileOpendir.hpp b/iRODS/lib/api/include/fileOpendir.hpp index 7047ebbb41..de5a5a62ad 100644 --- a/iRODS/lib/api/include/fileOpendir.hpp +++ b/iRODS/lib/api/include/fileOpendir.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/filePut.hpp b/iRODS/lib/api/include/filePut.hpp index 7fde662fc1..5cc6055a75 100644 --- a/iRODS/lib/api/include/filePut.hpp +++ b/iRODS/lib/api/include/filePut.hpp @@ -6,10 +6,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" diff --git a/iRODS/lib/api/include/fileRead.hpp b/iRODS/lib/api/include/fileRead.hpp index 803c4e3752..10fc5e3efd 100644 --- a/iRODS/lib/api/include/fileRead.hpp +++ b/iRODS/lib/api/include/fileRead.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/fileReaddir.hpp b/iRODS/lib/api/include/fileReaddir.hpp index 69560afd08..73016dbbec 100644 --- a/iRODS/lib/api/include/fileReaddir.hpp +++ b/iRODS/lib/api/include/fileReaddir.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct { int fileInx; diff --git a/iRODS/lib/api/include/fileRename.hpp b/iRODS/lib/api/include/fileRename.hpp index 40cc0ceadf..bc6efcdd6b 100644 --- a/iRODS/lib/api/include/fileRename.hpp +++ b/iRODS/lib/api/include/fileRename.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/fileRmdir.hpp b/iRODS/lib/api/include/fileRmdir.hpp index 4823b34267..6adbbd2416 100644 --- a/iRODS/lib/api/include/fileRmdir.hpp +++ b/iRODS/lib/api/include/fileRmdir.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/fileStageToCache.hpp b/iRODS/lib/api/include/fileStageToCache.hpp index 8290d02b4c..f43bed5b54 100644 --- a/iRODS/lib/api/include/fileStageToCache.hpp +++ b/iRODS/lib/api/include/fileStageToCache.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/fileStat.hpp b/iRODS/lib/api/include/fileStat.hpp index 3f38302f05..31849e4c5b 100644 --- a/iRODS/lib/api/include/fileStat.hpp +++ b/iRODS/lib/api/include/fileStat.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/fileSyncToArch.hpp b/iRODS/lib/api/include/fileSyncToArch.hpp index 92ca13b8f7..d5efa410e2 100644 --- a/iRODS/lib/api/include/fileSyncToArch.hpp +++ b/iRODS/lib/api/include/fileSyncToArch.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileStageToCache.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/fileTruncate.hpp b/iRODS/lib/api/include/fileTruncate.hpp index a918b8bc27..3182afe3da 100644 --- a/iRODS/lib/api/include/fileTruncate.hpp +++ b/iRODS/lib/api/include/fileTruncate.hpp @@ -8,10 +8,10 @@ /* This is a Internal I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileOpen.hpp" diff --git a/iRODS/lib/api/include/fileUnlink.hpp b/iRODS/lib/api/include/fileUnlink.hpp index 2d9f67137c..9344e089ef 100644 --- a/iRODS/lib/api/include/fileUnlink.hpp +++ b/iRODS/lib/api/include/fileUnlink.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" diff --git a/iRODS/lib/api/include/fileWrite.hpp b/iRODS/lib/api/include/fileWrite.hpp index 5b94fb2357..e9ca1af6e5 100644 --- a/iRODS/lib/api/include/fileWrite.hpp +++ b/iRODS/lib/api/include/fileWrite.hpp @@ -8,10 +8,10 @@ /* This is a low level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct { int fileInx; diff --git a/iRODS/lib/api/include/genQuery.hpp b/iRODS/lib/api/include/genQuery.hpp index f457a53ed2..0f09daa9b4 100644 --- a/iRODS/lib/api/include/genQuery.hpp +++ b/iRODS/lib/api/include/genQuery.hpp @@ -9,12 +9,12 @@ /* This is a high level file type API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" -#include "rodsGenQuery.hpp" /* for input/output structs, etc */ +#include "rodsGenQuery.h" /* for input/output structs, etc */ #if defined(RODS_SERVER) #define RS_GEN_QUERY rsGenQuery diff --git a/iRODS/lib/api/include/generalAdmin.hpp b/iRODS/lib/api/include/generalAdmin.hpp index 95f67a5974..0839c480b3 100644 --- a/iRODS/lib/api/include/generalAdmin.hpp +++ b/iRODS/lib/api/include/generalAdmin.hpp @@ -8,10 +8,10 @@ /* This is a high level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/generalRowInsert.hpp b/iRODS/lib/api/include/generalRowInsert.hpp index 8d690f4f19..3e027f862e 100644 --- a/iRODS/lib/api/include/generalRowInsert.hpp +++ b/iRODS/lib/api/include/generalRowInsert.hpp @@ -5,10 +5,10 @@ #define GENERAL_ROW_INSERT_HPP -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/generalRowPurge.hpp b/iRODS/lib/api/include/generalRowPurge.hpp index dcd1be9d67..a1142b232a 100644 --- a/iRODS/lib/api/include/generalRowPurge.hpp +++ b/iRODS/lib/api/include/generalRowPurge.hpp @@ -7,10 +7,10 @@ /* This is a Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/generalUpdate.hpp b/iRODS/lib/api/include/generalUpdate.hpp index 645984a2f3..f0ce9d8dad 100644 --- a/iRODS/lib/api/include/generalUpdate.hpp +++ b/iRODS/lib/api/include/generalUpdate.hpp @@ -4,10 +4,10 @@ #ifndef GENERAL_UPDATE_HPP #define GENERAL_UPDATE_HPP -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" #include "rodsGeneralUpdate.hpp" /* for input/output structs, etc */ diff --git a/iRODS/lib/api/include/getHierarchyForResc.hpp b/iRODS/lib/api/include/getHierarchyForResc.hpp index e9898b2e2f..35f57f065d 100644 --- a/iRODS/lib/api/include/getHierarchyForResc.hpp +++ b/iRODS/lib/api/include/getHierarchyForResc.hpp @@ -3,10 +3,10 @@ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct GetHierarchyForRescInp { char resc_name_[ MAX_NAME_LEN ]; diff --git a/iRODS/lib/api/include/getHostForGet.hpp b/iRODS/lib/api/include/getHostForGet.hpp index e3584e6a94..4c06a211a2 100644 --- a/iRODS/lib/api/include/getHostForGet.hpp +++ b/iRODS/lib/api/include/getHostForGet.hpp @@ -6,10 +6,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" diff --git a/iRODS/lib/api/include/getHostForPut.hpp b/iRODS/lib/api/include/getHostForPut.hpp index 0c386290f7..bfe5de4904 100644 --- a/iRODS/lib/api/include/getHostForPut.hpp +++ b/iRODS/lib/api/include/getHostForPut.hpp @@ -6,10 +6,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" diff --git a/iRODS/lib/api/include/getLimitedPassword.hpp b/iRODS/lib/api/include/getLimitedPassword.hpp index 7e5388a3c1..41349fafba 100644 --- a/iRODS/lib/api/include/getLimitedPassword.hpp +++ b/iRODS/lib/api/include/getLimitedPassword.hpp @@ -11,10 +11,10 @@ /* This is a high level Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "authenticate.hpp" typedef struct { diff --git a/iRODS/lib/api/include/getMiscSvrInfo.hpp b/iRODS/lib/api/include/getMiscSvrInfo.hpp index fb254ca5fc..e6e98890e1 100644 --- a/iRODS/lib/api/include/getMiscSvrInfo.hpp +++ b/iRODS/lib/api/include/getMiscSvrInfo.hpp @@ -4,10 +4,10 @@ #ifndef GET_MISC_SVR_INFO_HPP #define GET_MISC_SVR_INFO_HPP -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" /* there is no input struct. Therefore, the inPackInstruct is NULL */ diff --git a/iRODS/lib/api/include/getRemoteZoneResc.hpp b/iRODS/lib/api/include/getRemoteZoneResc.hpp index a3945dfac3..90cf3ca0bb 100644 --- a/iRODS/lib/api/include/getRemoteZoneResc.hpp +++ b/iRODS/lib/api/include/getRemoteZoneResc.hpp @@ -9,11 +9,11 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_GET_REMOTE_ZONE_RESC rsGetRemoteZoneResc diff --git a/iRODS/lib/api/include/getRescQuota.hpp b/iRODS/lib/api/include/getRescQuota.hpp index 0fabfa7e67..3f119ee46e 100644 --- a/iRODS/lib/api/include/getRescQuota.hpp +++ b/iRODS/lib/api/include/getRescQuota.hpp @@ -6,13 +6,13 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" -#include "rodsGenQuery.hpp" /* for input/output structs, etc */ +#include "rodsGenQuery.h" /* for input/output structs, etc */ /* definition for RescQuotaPolicy and GlobalQuotaLimit */ #define RESC_QUOTA_UNINIT -1 /* RescQuotaPolicy not initialized */ diff --git a/iRODS/lib/api/include/getTempPassword.hpp b/iRODS/lib/api/include/getTempPassword.hpp index dad7c45346..ec30bffa04 100644 --- a/iRODS/lib/api/include/getTempPassword.hpp +++ b/iRODS/lib/api/include/getTempPassword.hpp @@ -8,10 +8,10 @@ /* This is a high level Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "authenticate.hpp" typedef struct { diff --git a/iRODS/lib/api/include/getTempPasswordForOther.hpp b/iRODS/lib/api/include/getTempPasswordForOther.hpp index 6eb92222e6..44b7e52f2c 100644 --- a/iRODS/lib/api/include/getTempPasswordForOther.hpp +++ b/iRODS/lib/api/include/getTempPasswordForOther.hpp @@ -15,10 +15,10 @@ /* This is a high level Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "authenticate.hpp" typedef struct { diff --git a/iRODS/lib/api/include/getXmsgTicket.hpp b/iRODS/lib/api/include/getXmsgTicket.hpp index 42c5a4036f..9b7c93f309 100644 --- a/iRODS/lib/api/include/getXmsgTicket.hpp +++ b/iRODS/lib/api/include/getXmsgTicket.hpp @@ -9,11 +9,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "msParam.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/ies_client_hints.hpp b/iRODS/lib/api/include/ies_client_hints.hpp index 1593f1f8f2..4c38da5d8e 100644 --- a/iRODS/lib/api/include/ies_client_hints.hpp +++ b/iRODS/lib/api/include/ies_client_hints.hpp @@ -3,10 +3,10 @@ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #define IES_CLIENT_HINTS_AN 10216 diff --git a/iRODS/lib/api/include/l3FileGetSingleBuf.hpp b/iRODS/lib/api/include/l3FileGetSingleBuf.hpp index dfce31a667..d052d3b8cc 100644 --- a/iRODS/lib/api/include/l3FileGetSingleBuf.hpp +++ b/iRODS/lib/api/include/l3FileGetSingleBuf.hpp @@ -6,10 +6,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjGet.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/l3FilePutSingleBuf.hpp b/iRODS/lib/api/include/l3FilePutSingleBuf.hpp index d4873a1e5f..e29007c789 100644 --- a/iRODS/lib/api/include/l3FilePutSingleBuf.hpp +++ b/iRODS/lib/api/include/l3FilePutSingleBuf.hpp @@ -6,10 +6,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjPut.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/modAVUMetadata.hpp b/iRODS/lib/api/include/modAVUMetadata.hpp index 8400e73556..b7f241f50a 100644 --- a/iRODS/lib/api/include/modAVUMetadata.hpp +++ b/iRODS/lib/api/include/modAVUMetadata.hpp @@ -4,10 +4,10 @@ #ifndef MOD_AVU_METADATA_HPP #define MOD_AVU_METADATA_HPP -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/modAccessControl.hpp b/iRODS/lib/api/include/modAccessControl.hpp index fde106405f..c9c54e81c6 100644 --- a/iRODS/lib/api/include/modAccessControl.hpp +++ b/iRODS/lib/api/include/modAccessControl.hpp @@ -7,10 +7,10 @@ #define MOD_ACCESS_CONTROL_HPP -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" #define MOD_RESC_PREFIX "resource:" /* Used to indicate a resource diff --git a/iRODS/lib/api/include/modColl.hpp b/iRODS/lib/api/include/modColl.hpp index d629a7bcd2..f96c4f332a 100644 --- a/iRODS/lib/api/include/modColl.hpp +++ b/iRODS/lib/api/include/modColl.hpp @@ -8,11 +8,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_MOD_COLL rsModColl diff --git a/iRODS/lib/api/include/modDataObjMeta.hpp b/iRODS/lib/api/include/modDataObjMeta.hpp index 8b53a3ae73..dc26483e20 100644 --- a/iRODS/lib/api/include/modDataObjMeta.hpp +++ b/iRODS/lib/api/include/modDataObjMeta.hpp @@ -8,11 +8,11 @@ ar*/ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" typedef struct { dataObjInfo_t *dataObjInfo; diff --git a/iRODS/lib/api/include/objStat.hpp b/iRODS/lib/api/include/objStat.h similarity index 93% rename from iRODS/lib/api/include/objStat.hpp rename to iRODS/lib/api/include/objStat.h index 0f00890c82..54406d5426 100644 --- a/iRODS/lib/api/include/objStat.hpp +++ b/iRODS/lib/api/include/objStat.h @@ -3,20 +3,15 @@ /* dataObjRename.h - This dataObj may be generated by a program or script */ -#ifndef OBJ_STAT_HPP -#define OBJ_STAT_HPP +#ifndef OBJ_STAT_H__ +#define OBJ_STAT_H__ /* This is a Object File I/O API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjCopy.hpp" -#include "dataObjCopy.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" -#ifdef __cplusplus -extern "C" { -#endif /* rodsObjStat_t - this is similar to rodsStat_t but has minimum set of * parameter that are more irods specific */ @@ -34,6 +29,10 @@ typedef struct rodsObjStat { char rescHier[MAX_NAME_LEN]; } rodsObjStat_t; +#ifdef __cplusplus +extern "C" { +#endif + #if defined(RODS_SERVER) #define RS_OBJ_STAT rsObjStat @@ -79,4 +78,4 @@ rcObjStat( rcComm_t *conn, dataObjInp_t *dataObjInp, #ifdef __cplusplus } #endif -#endif /* OBJ_STAT_H */ +#endif // OBJ_STAT_H__ diff --git a/iRODS/lib/api/include/openCollection.hpp b/iRODS/lib/api/include/openCollection.hpp index a7e2069019..1c5dde0755 100644 --- a/iRODS/lib/api/include/openCollection.hpp +++ b/iRODS/lib/api/include/openCollection.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #define NUM_COLL_HANDLE 40 diff --git a/iRODS/lib/api/include/oprComplete.hpp b/iRODS/lib/api/include/oprComplete.hpp index 41401010df..cf479eeb9d 100644 --- a/iRODS/lib/api/include/oprComplete.hpp +++ b/iRODS/lib/api/include/oprComplete.hpp @@ -6,10 +6,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "reGlobalsExtern.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/pamAuthRequest.hpp b/iRODS/lib/api/include/pamAuthRequest.hpp index cb77e0e4f9..6ac7be60a1 100644 --- a/iRODS/lib/api/include/pamAuthRequest.hpp +++ b/iRODS/lib/api/include/pamAuthRequest.hpp @@ -8,10 +8,10 @@ /* This is a Metadata API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/phyBundleColl.hpp b/iRODS/lib/api/include/phyBundleColl.hpp index 6dbf0986b7..cf13f4b59a 100644 --- a/iRODS/lib/api/include/phyBundleColl.hpp +++ b/iRODS/lib/api/include/phyBundleColl.hpp @@ -13,10 +13,10 @@ #include #endif -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "structFileExtAndReg.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/api/include/phyPathReg.hpp b/iRODS/lib/api/include/phyPathReg.hpp index 0100996bce..799c75a271 100644 --- a/iRODS/lib/api/include/phyPathReg.hpp +++ b/iRODS/lib/api/include/phyPathReg.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_PHY_PATH_REG rsPhyPathReg diff --git a/iRODS/lib/api/include/procStat.hpp b/iRODS/lib/api/include/procStat.hpp index 4cffc0ce14..8b71501950 100644 --- a/iRODS/lib/api/include/procStat.hpp +++ b/iRODS/lib/api/include/procStat.hpp @@ -7,8 +7,8 @@ /* This is a Object File I/O API call */ #include "rodsConnect.h" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" /* fake attri index for procStatOut */ #define PID_INX 1000001 diff --git a/iRODS/lib/api/include/querySpecColl.hpp b/iRODS/lib/api/include/querySpecColl.hpp index afbd1e18fd..8713d48c11 100644 --- a/iRODS/lib/api/include/querySpecColl.hpp +++ b/iRODS/lib/api/include/querySpecColl.hpp @@ -8,9 +8,9 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "rods.h" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct specCollDesc { int l3descInx; diff --git a/iRODS/lib/api/include/rcvXmsg.hpp b/iRODS/lib/api/include/rcvXmsg.hpp index 2f025bd74a..6c5076fefa 100644 --- a/iRODS/lib/api/include/rcvXmsg.hpp +++ b/iRODS/lib/api/include/rcvXmsg.hpp @@ -6,11 +6,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "msParam.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/readCollection.hpp b/iRODS/lib/api/include/readCollection.hpp index e701c88591..896c7ea685 100644 --- a/iRODS/lib/api/include/readCollection.hpp +++ b/iRODS/lib/api/include/readCollection.hpp @@ -8,11 +8,11 @@ /* This is a high level type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "dataObjRead.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/api/include/regColl.hpp b/iRODS/lib/api/include/regColl.hpp index 9b7f01808a..c9eec3a354 100644 --- a/iRODS/lib/api/include/regColl.hpp +++ b/iRODS/lib/api/include/regColl.hpp @@ -8,11 +8,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_REG_COLL rsRegColl diff --git a/iRODS/lib/api/include/regDataObj.hpp b/iRODS/lib/api/include/regDataObj.hpp index e270a574d5..edc616c9b3 100644 --- a/iRODS/lib/api/include/regDataObj.hpp +++ b/iRODS/lib/api/include/regDataObj.hpp @@ -8,11 +8,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_REG_DATA_OBJ rsRegDataObj diff --git a/iRODS/lib/api/include/regReplica.hpp b/iRODS/lib/api/include/regReplica.hpp index 344bdca7dc..d1740f8463 100644 --- a/iRODS/lib/api/include/regReplica.hpp +++ b/iRODS/lib/api/include/regReplica.hpp @@ -8,11 +8,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" typedef struct { dataObjInfo_t *srcDataObjInfo; diff --git a/iRODS/lib/api/include/rmColl.hpp b/iRODS/lib/api/include/rmColl.hpp index 7c2a5c02c3..9ef860b02c 100644 --- a/iRODS/lib/api/include/rmColl.hpp +++ b/iRODS/lib/api/include/rmColl.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "miscUtil.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/ruleExecDel.hpp b/iRODS/lib/api/include/ruleExecDel.hpp index f7bdc86608..2b844e8da0 100644 --- a/iRODS/lib/api/include/ruleExecDel.hpp +++ b/iRODS/lib/api/include/ruleExecDel.hpp @@ -6,10 +6,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "reGlobalsExtern.hpp" typedef struct { diff --git a/iRODS/lib/api/include/ruleExecMod.hpp b/iRODS/lib/api/include/ruleExecMod.hpp index 319f39063d..4e7f7cce7c 100644 --- a/iRODS/lib/api/include/ruleExecMod.hpp +++ b/iRODS/lib/api/include/ruleExecMod.hpp @@ -7,10 +7,10 @@ #define RULE_EXEC_MOD_HPP /* This is a Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "reGlobalsExtern.hpp" typedef struct { diff --git a/iRODS/lib/api/include/ruleExecSubmit.hpp b/iRODS/lib/api/include/ruleExecSubmit.hpp index 504c75153b..94574d2c2b 100644 --- a/iRODS/lib/api/include/ruleExecSubmit.hpp +++ b/iRODS/lib/api/include/ruleExecSubmit.hpp @@ -6,10 +6,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "reGlobalsExtern.hpp" /* definition for exeStatus */ diff --git a/iRODS/lib/api/include/sendXmsg.hpp b/iRODS/lib/api/include/sendXmsg.hpp index 1b6a63ae27..e16cd427d5 100644 --- a/iRODS/lib/api/include/sendXmsg.hpp +++ b/iRODS/lib/api/include/sendXmsg.hpp @@ -6,11 +6,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #include "msParam.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/server_report.hpp b/iRODS/lib/api/include/server_report.hpp index 6471c2b3c7..fec0f16d2f 100644 --- a/iRODS/lib/api/include/server_report.hpp +++ b/iRODS/lib/api/include/server_report.hpp @@ -3,10 +3,10 @@ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #define SERVER_REPORT_AN 10204 diff --git a/iRODS/lib/api/include/simpleQuery.hpp b/iRODS/lib/api/include/simpleQuery.hpp index a4d511a5b7..3653681e1c 100644 --- a/iRODS/lib/api/include/simpleQuery.hpp +++ b/iRODS/lib/api/include/simpleQuery.hpp @@ -8,10 +8,10 @@ /* This is a high level file type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/specificQuery.hpp b/iRODS/lib/api/include/specificQuery.hpp index c242ef4c3e..f576fe276c 100644 --- a/iRODS/lib/api/include/specificQuery.hpp +++ b/iRODS/lib/api/include/specificQuery.hpp @@ -8,13 +8,13 @@ /* This is a metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" -#include "rodsGenQuery.hpp" /* for output struct, etc */ +#include "rodsGenQuery.h" /* for output struct, etc */ typedef struct { char *sql; diff --git a/iRODS/lib/api/include/sslEnd.hpp b/iRODS/lib/api/include/sslEnd.hpp index 3f24c75986..c43221a008 100644 --- a/iRODS/lib/api/include/sslEnd.hpp +++ b/iRODS/lib/api/include/sslEnd.hpp @@ -6,15 +6,15 @@ /* This call is used to ask the agent to turn SSL off for the communication socket. */ -#ifndef SSL_END_HPP -#define SSL_END_HPP +#ifndef SSL_END_H__ +#define SSL_END_H__ /* This is a SSL type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { @@ -43,4 +43,4 @@ rcSslEnd( rcComm_t *conn, sslEndInp_t *sslEndInp ); #ifdef __cplusplus } #endif -#endif /* SSL_END_H */ +#endif /* SSL_END_H__ */ diff --git a/iRODS/lib/api/include/sslStart.hpp b/iRODS/lib/api/include/sslStart.hpp index 9ba3c541e2..1acb25c2ed 100644 --- a/iRODS/lib/api/include/sslStart.hpp +++ b/iRODS/lib/api/include/sslStart.hpp @@ -11,10 +11,10 @@ /* This is a SSL type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/streamClose.hpp b/iRODS/lib/api/include/streamClose.hpp index 1783ebf120..44bc10c59c 100644 --- a/iRODS/lib/api/include/streamClose.hpp +++ b/iRODS/lib/api/include/streamClose.hpp @@ -6,10 +6,10 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileClose.hpp" diff --git a/iRODS/lib/api/include/streamRead.hpp b/iRODS/lib/api/include/streamRead.hpp index c49501a3f6..c2fa99f3da 100644 --- a/iRODS/lib/api/include/streamRead.hpp +++ b/iRODS/lib/api/include/streamRead.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileRead.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/structFileBundle.hpp b/iRODS/lib/api/include/structFileBundle.hpp index d4e921849c..dd021ffa3d 100644 --- a/iRODS/lib/api/include/structFileBundle.hpp +++ b/iRODS/lib/api/include/structFileBundle.hpp @@ -9,10 +9,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "structFileExtAndReg.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/structFileExtAndReg.hpp b/iRODS/lib/api/include/structFileExtAndReg.hpp index 6bd1ccb15a..cbe91415cc 100644 --- a/iRODS/lib/api/include/structFileExtAndReg.hpp +++ b/iRODS/lib/api/include/structFileExtAndReg.hpp @@ -9,10 +9,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct StructFileExtAndRegInp { char objPath[MAX_NAME_LEN]; /* the obj path of the struct file */ diff --git a/iRODS/lib/api/include/structFileExtract.hpp b/iRODS/lib/api/include/structFileExtract.hpp index 57b151a250..0d52321fc0 100644 --- a/iRODS/lib/api/include/structFileExtract.hpp +++ b/iRODS/lib/api/include/structFileExtract.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "structFileSync.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/structFileSync.hpp b/iRODS/lib/api/include/structFileSync.hpp index 7c8bbb1632..715521f190 100644 --- a/iRODS/lib/api/include/structFileSync.hpp +++ b/iRODS/lib/api/include/structFileSync.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" /* definition for flags */ diff --git a/iRODS/lib/api/include/subStructFileClose.hpp b/iRODS/lib/api/include/subStructFileClose.hpp index d349c81376..927a44219d 100644 --- a/iRODS/lib/api/include/subStructFileClose.hpp +++ b/iRODS/lib/api/include/subStructFileClose.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "subStructFileRead.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/subStructFileClosedir.hpp b/iRODS/lib/api/include/subStructFileClosedir.hpp index ed98433116..c396a858b6 100644 --- a/iRODS/lib/api/include/subStructFileClosedir.hpp +++ b/iRODS/lib/api/include/subStructFileClosedir.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "subStructFileRead.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/subStructFileCreate.hpp b/iRODS/lib/api/include/subStructFileCreate.hpp index 281b54df9a..589709d638 100644 --- a/iRODS/lib/api/include/subStructFileCreate.hpp +++ b/iRODS/lib/api/include/subStructFileCreate.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_CREATE rsSubStructFileCreate diff --git a/iRODS/lib/api/include/subStructFileGet.hpp b/iRODS/lib/api/include/subStructFileGet.hpp index 69d1a8b269..b2b48a576e 100644 --- a/iRODS/lib/api/include/subStructFileGet.hpp +++ b/iRODS/lib/api/include/subStructFileGet.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_GET rsSubStructFileGet diff --git a/iRODS/lib/api/include/subStructFileLseek.hpp b/iRODS/lib/api/include/subStructFileLseek.hpp index a858e24b54..3b0c3f014d 100644 --- a/iRODS/lib/api/include/subStructFileLseek.hpp +++ b/iRODS/lib/api/include/subStructFileLseek.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileLseek.hpp" typedef struct SubStructFileLseekInp { diff --git a/iRODS/lib/api/include/subStructFileMkdir.hpp b/iRODS/lib/api/include/subStructFileMkdir.hpp index d0cc1503f8..dba4c525a3 100644 --- a/iRODS/lib/api/include/subStructFileMkdir.hpp +++ b/iRODS/lib/api/include/subStructFileMkdir.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_MKDIR rsSubStructFileMkdir diff --git a/iRODS/lib/api/include/subStructFileOpen.hpp b/iRODS/lib/api/include/subStructFileOpen.hpp index aaa96ef391..aa21361045 100644 --- a/iRODS/lib/api/include/subStructFileOpen.hpp +++ b/iRODS/lib/api/include/subStructFileOpen.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_OPEN rsSubStructFileOpen diff --git a/iRODS/lib/api/include/subStructFileOpendir.hpp b/iRODS/lib/api/include/subStructFileOpendir.hpp index cf695a24a2..f80e383d29 100644 --- a/iRODS/lib/api/include/subStructFileOpendir.hpp +++ b/iRODS/lib/api/include/subStructFileOpendir.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_OPENDIR rsSubStructFileOpendir diff --git a/iRODS/lib/api/include/subStructFilePut.hpp b/iRODS/lib/api/include/subStructFilePut.hpp index 02b5f1b2c8..0c7b0b7e54 100644 --- a/iRODS/lib/api/include/subStructFilePut.hpp +++ b/iRODS/lib/api/include/subStructFilePut.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_PUT rsSubStructFilePut diff --git a/iRODS/lib/api/include/subStructFileRead.hpp b/iRODS/lib/api/include/subStructFileRead.hpp index 92c31431bd..2ec2a735eb 100644 --- a/iRODS/lib/api/include/subStructFileRead.hpp +++ b/iRODS/lib/api/include/subStructFileRead.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct SubStructFileFdOpr { rodsHostAddr_t addr; diff --git a/iRODS/lib/api/include/subStructFileReaddir.hpp b/iRODS/lib/api/include/subStructFileReaddir.hpp index 3b7d220691..8a9f97b2aa 100644 --- a/iRODS/lib/api/include/subStructFileReaddir.hpp +++ b/iRODS/lib/api/include/subStructFileReaddir.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "subStructFileRead.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/subStructFileRename.hpp b/iRODS/lib/api/include/subStructFileRename.hpp index aff853358a..02afbb1883 100644 --- a/iRODS/lib/api/include/subStructFileRename.hpp +++ b/iRODS/lib/api/include/subStructFileRename.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" typedef struct SubStructFileRenameInp { subFile_t subFile; diff --git a/iRODS/lib/api/include/subStructFileRmdir.hpp b/iRODS/lib/api/include/subStructFileRmdir.hpp index 2a13ff77b0..38c3ecf122 100644 --- a/iRODS/lib/api/include/subStructFileRmdir.hpp +++ b/iRODS/lib/api/include/subStructFileRmdir.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_RMDIR rsSubStructFileRmdir diff --git a/iRODS/lib/api/include/subStructFileStat.hpp b/iRODS/lib/api/include/subStructFileStat.hpp index 0b94f3bda6..a768dafc61 100644 --- a/iRODS/lib/api/include/subStructFileStat.hpp +++ b/iRODS/lib/api/include/subStructFileStat.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_STAT rsSubStructFileStat diff --git a/iRODS/lib/api/include/subStructFileTruncate.hpp b/iRODS/lib/api/include/subStructFileTruncate.hpp index b6541e20aa..93b7a8ab35 100644 --- a/iRODS/lib/api/include/subStructFileTruncate.hpp +++ b/iRODS/lib/api/include/subStructFileTruncate.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "fileTruncate.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/subStructFileUnlink.hpp b/iRODS/lib/api/include/subStructFileUnlink.hpp index 0adb60cc2f..c9487fd0f2 100644 --- a/iRODS/lib/api/include/subStructFileUnlink.hpp +++ b/iRODS/lib/api/include/subStructFileUnlink.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #if defined(RODS_SERVER) #define RS_SUB_STRUCT_FILE_UNLINK rsSubStructFileUnlink diff --git a/iRODS/lib/api/include/subStructFileWrite.hpp b/iRODS/lib/api/include/subStructFileWrite.hpp index e9dba16e0c..bd989dcf76 100644 --- a/iRODS/lib/api/include/subStructFileWrite.hpp +++ b/iRODS/lib/api/include/subStructFileWrite.hpp @@ -8,10 +8,10 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "subStructFileRead.hpp" #if defined(RODS_SERVER) diff --git a/iRODS/lib/api/include/syncMountedColl.hpp b/iRODS/lib/api/include/syncMountedColl.hpp index 929ed0e16b..4e36e3e6f3 100644 --- a/iRODS/lib/api/include/syncMountedColl.hpp +++ b/iRODS/lib/api/include/syncMountedColl.hpp @@ -8,11 +8,11 @@ /* This is a Object File I/O API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" #if defined(RODS_SERVER) #define RS_SYNC_MOUNTED_COLL rsSyncMountedColl diff --git a/iRODS/lib/api/include/ticketAdmin.hpp b/iRODS/lib/api/include/ticketAdmin.hpp index f68a28eb19..9929c9a339 100644 --- a/iRODS/lib/api/include/ticketAdmin.hpp +++ b/iRODS/lib/api/include/ticketAdmin.hpp @@ -13,10 +13,10 @@ /* This is a Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/unbunAndRegPhyBunfile.hpp b/iRODS/lib/api/include/unbunAndRegPhyBunfile.hpp index 9b9f9dac56..50e4ea54ea 100644 --- a/iRODS/lib/api/include/unbunAndRegPhyBunfile.hpp +++ b/iRODS/lib/api/include/unbunAndRegPhyBunfile.hpp @@ -8,10 +8,10 @@ /* This is a Object File I/O call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "dataObjWrite.hpp" #include "dataObjClose.hpp" #include "dataCopy.hpp" diff --git a/iRODS/lib/api/include/unregDataObj.hpp b/iRODS/lib/api/include/unregDataObj.hpp index 7ffc77a3bc..ff575016ca 100644 --- a/iRODS/lib/api/include/unregDataObj.hpp +++ b/iRODS/lib/api/include/unregDataObj.hpp @@ -8,11 +8,11 @@ /* This is Object File I/O type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" -#include "dataObjInpOut.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" +#include "dataObjInpOut.h" typedef struct { dataObjInfo_t *dataObjInfo; diff --git a/iRODS/lib/api/include/userAdmin.hpp b/iRODS/lib/api/include/userAdmin.hpp index 3246076ec1..02127d71dd 100644 --- a/iRODS/lib/api/include/userAdmin.hpp +++ b/iRODS/lib/api/include/userAdmin.hpp @@ -12,10 +12,10 @@ /* This is a Metadata type API call */ -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #include "icatDefines.hpp" typedef struct { diff --git a/iRODS/lib/api/include/zone_report.hpp b/iRODS/lib/api/include/zone_report.hpp index f1249abf25..aa7db90623 100644 --- a/iRODS/lib/api/include/zone_report.hpp +++ b/iRODS/lib/api/include/zone_report.hpp @@ -3,10 +3,10 @@ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" -#include "procApiRequest.hpp" -#include "apiNumber.hpp" +#include "procApiRequest.h" +#include "apiNumber.h" #define ZONE_REPORT_AN 10205 diff --git a/iRODS/lib/api/src/rcDataObjGet.cpp b/iRODS/lib/api/src/rcDataObjGet.cpp index 13c7c10da8..28dddaf4d0 100644 --- a/iRODS/lib/api/src/rcDataObjGet.cpp +++ b/iRODS/lib/api/src/rcDataObjGet.cpp @@ -13,7 +13,7 @@ #include "dataObjGet.hpp" #include "rcPortalOpr.hpp" #include "apiHeaderAll.hpp" -#include "sockComm.hpp" +#include "sockComm.h" // =-=-=-=-=-=-=- #include "irods_client_server_negotiation.hpp" diff --git a/iRODS/lib/api/src/rcDataObjPut.cpp b/iRODS/lib/api/src/rcDataObjPut.cpp index 7a187feec1..b37b2e1f0e 100644 --- a/iRODS/lib/api/src/rcDataObjPut.cpp +++ b/iRODS/lib/api/src/rcDataObjPut.cpp @@ -11,7 +11,7 @@ #include "dataObjPut.hpp" #include "rcPortalOpr.hpp" #include "oprComplete.hpp" -#include "sockComm.hpp" +#include "sockComm.h" // =-=-=-=-=-=-=- #include "irods_client_server_negotiation.hpp" diff --git a/iRODS/lib/api/src/rcObjStat.cpp b/iRODS/lib/api/src/rcObjStat.cpp index 0d99acf07d..c6978b239d 100644 --- a/iRODS/lib/api/src/rcObjStat.cpp +++ b/iRODS/lib/api/src/rcObjStat.cpp @@ -8,7 +8,7 @@ /* This is script-generated code. */ /* See objStat.h for a description of this API call.*/ -#include "objStat.hpp" +#include "objStat.h" /** * \fn rcObjStat (rcComm_t *conn, dataObjInp_t *dataObjInp, diff --git a/iRODS/lib/core/include/apiHandler.hpp b/iRODS/lib/core/include/apiHandler.hpp index 43509b660f..2349369a77 100644 --- a/iRODS/lib/core/include/apiHandler.hpp +++ b/iRODS/lib/core/include/apiHandler.hpp @@ -11,7 +11,7 @@ // =-=-=-=-=-=-=- // boost includes -#include "rods.hpp" +#include "rods.h" #include "packStruct.hpp" #include "irods_lookup_table.hpp" #include "irods_plugin_base.hpp" diff --git a/iRODS/lib/core/include/bunUtil.hpp b/iRODS/lib/core/include/bunUtil.hpp index 294a1e6691..eaf1b40425 100644 --- a/iRODS/lib/core/include/bunUtil.hpp +++ b/iRODS/lib/core/include/bunUtil.hpp @@ -5,9 +5,9 @@ #ifndef BUN_UTIL_HPP #define BUN_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/chksumUtil.hpp b/iRODS/lib/core/include/chksumUtil.hpp index 1c82f3b669..8dd174f503 100644 --- a/iRODS/lib/core/include/chksumUtil.hpp +++ b/iRODS/lib/core/include/chksumUtil.hpp @@ -5,9 +5,9 @@ #ifndef CHKSUM_UTIL_HPP #define CHKSUM_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/cpUtil.hpp b/iRODS/lib/core/include/cpUtil.hpp index 1db08867e1..7e3975b726 100644 --- a/iRODS/lib/core/include/cpUtil.hpp +++ b/iRODS/lib/core/include/cpUtil.hpp @@ -6,9 +6,9 @@ #define CP_UTIL_HPP #include -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/fsckUtil.hpp b/iRODS/lib/core/include/fsckUtil.hpp index e48881203c..69832ef2e4 100644 --- a/iRODS/lib/core/include/fsckUtil.hpp +++ b/iRODS/lib/core/include/fsckUtil.hpp @@ -5,9 +5,9 @@ #ifndef FSCK_UTIL_HPP #define FSCK_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #include "scanUtil.hpp" #ifdef __cplusplus diff --git a/iRODS/lib/core/include/getRodsEnv.hpp b/iRODS/lib/core/include/getRodsEnv.h similarity index 96% rename from iRODS/lib/core/include/getRodsEnv.hpp rename to iRODS/lib/core/include/getRodsEnv.h index 7bfb6af81f..c4ee21152c 100644 --- a/iRODS/lib/core/include/getRodsEnv.hpp +++ b/iRODS/lib/core/include/getRodsEnv.h @@ -1,13 +1,10 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#ifndef GET_RODS_ENV -#define GET_RODS_ENV +#ifndef GET_RODS_ENV_H__ +#define GET_RODS_ENV_H__ #define PRINT_RODS_ENV_STR "PRINT_IRODS_ENV" -#ifdef __cplusplus -extern "C" { -#endif typedef struct { char rodsUserName[NAME_LEN]; char rodsHost[NAME_LEN]; @@ -53,19 +50,23 @@ typedef struct { int irodsCtrlPlanePort; int irodsCtrlPlaneEncryptionNumHashRounds; char irodsCtrlPlaneEncryptionAlgorithm[ HEADER_TYPE_LEN ]; - + // =-=-=-=-=-=-=- // advanced settings int irodsMaxSizeForSingleBuffer; int irodsDefaultNumberTransferThreads; int irodsTransBufferSizeForParaTrans; - + // =-=-=-=-=-=-=- // override of plugin installation directory char irodsPluginHome[MAX_NAME_LEN]; } rodsEnv; +#ifdef __cplusplus +extern "C" { +#endif + int getRodsEnv( rodsEnv *myRodsEnv ); char *getRodsEnvFileName(); @@ -78,4 +79,4 @@ void _reloadRodsEnv( rodsEnv &myRodsEnv ); } #endif -#endif /* GET_RODS_ENV */ +#endif // GET_RODS_ENV_H__ diff --git a/iRODS/lib/core/include/getUtil.hpp b/iRODS/lib/core/include/getUtil.hpp index d03a0e5a9b..10846e580f 100644 --- a/iRODS/lib/core/include/getUtil.hpp +++ b/iRODS/lib/core/include/getUtil.hpp @@ -5,9 +5,9 @@ #ifndef GET_UTIL_HPP #define GET_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/guiProgressCallback.hpp b/iRODS/lib/core/include/guiProgressCallback.h similarity index 90% rename from iRODS/lib/core/include/guiProgressCallback.hpp rename to iRODS/lib/core/include/guiProgressCallback.h index e69b51e6f7..ef7686c258 100644 --- a/iRODS/lib/core/include/guiProgressCallback.hpp +++ b/iRODS/lib/core/include/guiProgressCallback.h @@ -1,5 +1,5 @@ -#ifndef _GUI_PROGRESS_CALLBACK_HPP_ -#define _GUI_PROGRESS_CALLBACK_HPP_ +#ifndef _GUI_PROGRESS_CALLBACK_H__ +#define _GUI_PROGRESS_CALLBACK_H__ #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/irods_auth_object.hpp b/iRODS/lib/core/include/irods_auth_object.hpp index 2c16a95cd5..e727bad3e3 100644 --- a/iRODS/lib/core/include/irods_auth_object.hpp +++ b/iRODS/lib/core/include/irods_auth_object.hpp @@ -4,7 +4,7 @@ #include "irods_error.hpp" #include "irods_first_class_object.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" // boost includes #include diff --git a/iRODS/lib/core/include/irods_auth_types.hpp b/iRODS/lib/core/include/irods_auth_types.hpp index 31446b18c8..485e0d3848 100644 --- a/iRODS/lib/core/include/irods_auth_types.hpp +++ b/iRODS/lib/core/include/irods_auth_types.hpp @@ -11,7 +11,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" namespace irods { // =-=-=-=-=-=-=- diff --git a/iRODS/lib/core/include/irods_client_server_negotiation.hpp b/iRODS/lib/core/include/irods_client_server_negotiation.hpp index c088b056d6..73723f3315 100644 --- a/iRODS/lib/core/include/irods_client_server_negotiation.hpp +++ b/iRODS/lib/core/include/irods_client_server_negotiation.hpp @@ -12,7 +12,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // stl includes diff --git a/iRODS/lib/core/include/irods_error.hpp b/iRODS/lib/core/include/irods_error.hpp index 3ae54c9d20..bfd0451612 100644 --- a/iRODS/lib/core/include/irods_error.hpp +++ b/iRODS/lib/core/include/irods_error.hpp @@ -10,7 +10,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rodsType.hpp" +#include "rodsType.h" // =-=-=-=-=-=-=- // boost assertion handling macro, needed everywhere diff --git a/iRODS/lib/core/include/irods_first_class_object.hpp b/iRODS/lib/core/include/irods_first_class_object.hpp index 564c364d67..db6180541f 100644 --- a/iRODS/lib/core/include/irods_first_class_object.hpp +++ b/iRODS/lib/core/include/irods_first_class_object.hpp @@ -8,7 +8,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // boost includs diff --git a/iRODS/lib/core/include/irods_log.hpp b/iRODS/lib/core/include/irods_log.hpp index 3db3fe388a..1f7b3a6aa5 100644 --- a/iRODS/lib/core/include/irods_log.hpp +++ b/iRODS/lib/core/include/irods_log.hpp @@ -3,8 +3,8 @@ // =-=-=-=-=-=-=- #include "irods_error.hpp" -#include "rodsLog.hpp" -#include "stringOpr.hpp" +#include "rodsLog.h" +#include "stringOpr.h" // =-=-=-=-=-=-=- // stl includes diff --git a/iRODS/lib/core/include/irods_lookup_table.hpp b/iRODS/lib/core/include/irods_lookup_table.hpp index 9625c3811e..185a18d6c8 100644 --- a/iRODS/lib/core/include/irods_lookup_table.hpp +++ b/iRODS/lib/core/include/irods_lookup_table.hpp @@ -6,11 +6,12 @@ #include // =-=-=-=-=-=-=- +#include "rodsErrorTable.h" #include "irods_hash.hpp" #include "irods_error.hpp" #include "irods_stacktrace.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" namespace irods { diff --git a/iRODS/lib/core/include/irods_native_auth_object.hpp b/iRODS/lib/core/include/irods_native_auth_object.hpp index 5796cab7e9..d5d36d7ab4 100644 --- a/iRODS/lib/core/include/irods_native_auth_object.hpp +++ b/iRODS/lib/core/include/irods_native_auth_object.hpp @@ -4,7 +4,7 @@ #include "irods_error.hpp" #include "irods_auth_object.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // boost includes diff --git a/iRODS/lib/core/include/irods_network_object.hpp b/iRODS/lib/core/include/irods_network_object.hpp index 615b4d0855..a6db45db2b 100644 --- a/iRODS/lib/core/include/irods_network_object.hpp +++ b/iRODS/lib/core/include/irods_network_object.hpp @@ -6,7 +6,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // boost includes diff --git a/iRODS/lib/core/include/irods_network_types.hpp b/iRODS/lib/core/include/irods_network_types.hpp index 46313c8d1b..27e01d0e7e 100644 --- a/iRODS/lib/core/include/irods_network_types.hpp +++ b/iRODS/lib/core/include/irods_network_types.hpp @@ -11,7 +11,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" namespace irods { // =-=-=-=-=-=-=- diff --git a/iRODS/lib/core/include/irods_operation_rule_execution_manager_base.hpp b/iRODS/lib/core/include/irods_operation_rule_execution_manager_base.hpp index e75ff0beca..648b603929 100644 --- a/iRODS/lib/core/include/irods_operation_rule_execution_manager_base.hpp +++ b/iRODS/lib/core/include/irods_operation_rule_execution_manager_base.hpp @@ -3,7 +3,7 @@ // =-=-=-=-=-=-=- #include "irods_log.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // boost includes diff --git a/iRODS/lib/core/include/irods_operation_wrapper.hpp b/iRODS/lib/core/include/irods_operation_wrapper.hpp index 4881f21b03..800d768c28 100644 --- a/iRODS/lib/core/include/irods_operation_wrapper.hpp +++ b/iRODS/lib/core/include/irods_operation_wrapper.hpp @@ -22,7 +22,7 @@ // =-=-=-=-=-=-=- // irods includes #include "reGlobalsExtern.hpp" -#include "dataObjInpOut.hpp" +#include "dataObjInpOut.h" #include diff --git a/iRODS/lib/core/include/irods_osauth_auth_object.hpp b/iRODS/lib/core/include/irods_osauth_auth_object.hpp index 2de6efc621..263a32c34a 100644 --- a/iRODS/lib/core/include/irods_osauth_auth_object.hpp +++ b/iRODS/lib/core/include/irods_osauth_auth_object.hpp @@ -4,7 +4,7 @@ #include "irods_error.hpp" #include "irods_auth_object.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // boost includes diff --git a/iRODS/lib/core/include/irods_pam_auth_object.hpp b/iRODS/lib/core/include/irods_pam_auth_object.hpp index 581e968407..1629e35366 100644 --- a/iRODS/lib/core/include/irods_pam_auth_object.hpp +++ b/iRODS/lib/core/include/irods_pam_auth_object.hpp @@ -4,7 +4,7 @@ #include "irods_error.hpp" #include "irods_auth_object.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // boost includes diff --git a/iRODS/lib/core/include/irods_parse_command_line_options.hpp b/iRODS/lib/core/include/irods_parse_command_line_options.hpp index 91808d7438..b48e77d990 100644 --- a/iRODS/lib/core/include/irods_parse_command_line_options.hpp +++ b/iRODS/lib/core/include/irods_parse_command_line_options.hpp @@ -4,7 +4,7 @@ #ifndef PARSE_COMMAND_LINE_OPTIONS #define PARSE_COMMAND_LINE_OPTIONS -#include "parseCommandLine.hpp" +#include "parseCommandLine.h" extern "C" int parse_opts_and_paths( diff --git a/iRODS/lib/core/include/irods_plugin_base.hpp b/iRODS/lib/core/include/irods_plugin_base.hpp index 4eb6dc78f0..a77d17e4de 100644 --- a/iRODS/lib/core/include/irods_plugin_base.hpp +++ b/iRODS/lib/core/include/irods_plugin_base.hpp @@ -11,7 +11,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- #include "irods_error.hpp" diff --git a/iRODS/lib/core/include/lsUtil.hpp b/iRODS/lib/core/include/lsUtil.hpp index aa83a6eeeb..0e9fee6b2d 100644 --- a/iRODS/lib/core/include/lsUtil.hpp +++ b/iRODS/lib/core/include/lsUtil.hpp @@ -5,9 +5,9 @@ #ifndef LS_UTIL_HPP #define LS_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/mcollUtil.hpp b/iRODS/lib/core/include/mcollUtil.hpp index 1bbf09b9b2..016dfae5e1 100644 --- a/iRODS/lib/core/include/mcollUtil.hpp +++ b/iRODS/lib/core/include/mcollUtil.hpp @@ -5,9 +5,9 @@ #ifndef MCOLL_UTIL_HPP #define MCOLL_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/miscUtil.hpp b/iRODS/lib/core/include/miscUtil.hpp index 3d7cc11ef9..609d9b8884 100644 --- a/iRODS/lib/core/include/miscUtil.hpp +++ b/iRODS/lib/core/include/miscUtil.hpp @@ -5,9 +5,9 @@ #ifndef MISC_UTIL_HPP #define MISC_UTIL_HPP -#include "rodsPath.hpp" -#include "parseCommandLine.hpp" -#include "guiProgressCallback.hpp" +#include "rodsPath.h" +#include "parseCommandLine.h" +#include "guiProgressCallback.h" #define INIT_UMASK_VAL 99999999 typedef struct CollSqlResult { diff --git a/iRODS/lib/core/include/mkdirUtil.hpp b/iRODS/lib/core/include/mkdirUtil.hpp index b5a335ec9f..82a557600f 100644 --- a/iRODS/lib/core/include/mkdirUtil.hpp +++ b/iRODS/lib/core/include/mkdirUtil.hpp @@ -5,9 +5,9 @@ #ifndef MKDIR_UTIL_HPP #define MKDIR_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/msParam.hpp b/iRODS/lib/core/include/msParam.hpp index 77b9e4c400..e558141fac 100644 --- a/iRODS/lib/core/include/msParam.hpp +++ b/iRODS/lib/core/include/msParam.hpp @@ -9,13 +9,12 @@ #ifndef MS_PARAM_HPP #define MS_PARAM_HPP -#include "rods.hpp" -#include "rodsError.hpp" -#include "objInfo.hpp" +#include "rods.h" +#include "objInfo.h" #include "dataObjCopy.hpp" #include "structFileExtAndReg.hpp" #include "execCmd.hpp" -#include "rodsPath.hpp" +#include "rodsPath.h" #ifdef __cplusplus diff --git a/iRODS/lib/core/include/mvUtil.hpp b/iRODS/lib/core/include/mvUtil.hpp index ecc3709a0a..54f7004532 100644 --- a/iRODS/lib/core/include/mvUtil.hpp +++ b/iRODS/lib/core/include/mvUtil.hpp @@ -6,9 +6,9 @@ #define MV_UTIL_HPP #include -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/obf.hpp b/iRODS/lib/core/include/obf.h similarity index 96% rename from iRODS/lib/core/include/obf.hpp rename to iRODS/lib/core/include/obf.h index 7f7e43d443..3e9bf593cb 100644 --- a/iRODS/lib/core/include/obf.hpp +++ b/iRODS/lib/core/include/obf.h @@ -1,16 +1,18 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ /* definitions for obf routines */ - -#ifdef __cplusplus -extern "C" { -#endif +#ifndef OBF_H__ +#define OBF_H__ #define HASH_TYPE_MD5 1 #define HASH_TYPE_SHA1 2 #define HASH_TYPE_DEFAULT 3 #define SHA1_FLAG_STRING ":::sha1" +#ifdef __cplusplus +extern "C" { +#endif + void obfDecodeByKey( const char *in, const char *key, char *out ); int obfRmPw( int opt ); int obfGetPw( char *pw ); @@ -30,10 +32,10 @@ void obfMakeOneWayHash( int hashType, unsigned const char *inBuf, int inBufSize, unsigned char *outHash ); void obfSetDefaultHashType( int type ); int obfGetDefaultHashType(); - - char *obfGetMD5Hash( const char *stringToHash ); + #ifdef __cplusplus } #endif +#endif // OBF_H__ diff --git a/iRODS/lib/core/include/objInfo.hpp b/iRODS/lib/core/include/objInfo.h similarity index 98% rename from iRODS/lib/core/include/objInfo.hpp rename to iRODS/lib/core/include/objInfo.h index 7fa57d92cd..12c848ea59 100644 --- a/iRODS/lib/core/include/objInfo.hpp +++ b/iRODS/lib/core/include/objInfo.h @@ -14,19 +14,15 @@ value string based on a keyword. */ -#ifndef OBJ_INFO_HPP -#define OBJ_INFO_HPP +#ifndef OBJ_INFO_H__ +#define OBJ_INFO_H__ -#include "rodsType.hpp" -#include "rodsUser.hpp" +#include "rodsType.h" +#include "rodsUser.h" /* this defines the "copies" condition */ #define ALL_COPIES -1 /* "all" */ -#ifdef __cplusplus -extern "C" { -#endif - /* defines some commonly used dataTypes */ #define GENERIC_DT_STR "generic" #define TAR_DT_STR "tar file" @@ -331,9 +327,5 @@ typedef struct StructFileTypeDef { structFileType_t type; } structFileTypeDef_t; -#ifdef __cplusplus -} -#endif - -#endif /* OBJ_INFO_H */ +#endif // OBJ_INFO_H__ diff --git a/iRODS/lib/core/include/osauth.hpp b/iRODS/lib/core/include/osauth.h similarity index 93% rename from iRODS/lib/core/include/osauth.hpp rename to iRODS/lib/core/include/osauth.h index f70b6853ca..ed0af4e9cb 100644 --- a/iRODS/lib/core/include/osauth.hpp +++ b/iRODS/lib/core/include/osauth.h @@ -2,14 +2,18 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* definitions for osauth routines */ -#ifdef __cplusplus -extern "C" { -#endif +#ifndef OS_AUTH_H__ +#define OS_AUTH_H__ + #define OS_AUTH_FLAG "##OS_AUTH" #define OS_AUTH_CMD "genOSAuth" #define OS_AUTH_ENV_USER "OSAUTH_USERNAME" +#ifdef __cplusplus +extern "C" { +#endif + int osauthGetAuth( char *challenge, char *username, char *authenticator, int authenticator_buflen ); int osauthVerifyResponse( char *challenge, char *username, char *response ); int osauthGetKey( char **key, int *key_len ); @@ -21,3 +25,4 @@ int osauthGenerateAuthenticator( char *username, int uid, char *challenge, char } #endif +#endif // OS_AUTH_H__ diff --git a/iRODS/lib/core/include/parseCommandLine.hpp b/iRODS/lib/core/include/parseCommandLine.h similarity index 93% rename from iRODS/lib/core/include/parseCommandLine.hpp rename to iRODS/lib/core/include/parseCommandLine.h index 2cdd74f83c..5dd5660e1f 100644 --- a/iRODS/lib/core/include/parseCommandLine.hpp +++ b/iRODS/lib/core/include/parseCommandLine.h @@ -3,18 +3,8 @@ /* definitions for parseCommandLine routine */ -#ifndef RODS_PARSE_COMMAND_LINE -#define RODS_PARSE_COMMAND_LINE - -#if _WIN32 -#include "irodsntutil.hpp" -#include "IRodsLib3.hpp" -#include "rodsType.hpp" -#endif - -#ifdef __cplusplus -extern "C" { -#endif +#ifndef RODS_PARSE_COMMAND_LINE_H__ +#define RODS_PARSE_COMMAND_LINE_H__ #define True 1 #define False 0 @@ -150,6 +140,10 @@ typedef struct { } rodsArguments_t; +#ifdef __cplusplus +extern "C" { +#endif + int parseCmdLineOpt( int argc, char **argv, const char *optString, int includeLong, rodsArguments_t *rodsArgs ); @@ -157,4 +151,4 @@ parseCmdLineOpt( int argc, char **argv, const char *optString, int includeLong, #ifdef __cplusplus } #endif -#endif /* RODS_PARSE_COMMAND_LINE */ +#endif // RODS_PARSE_COMMAND_LINE_H__ diff --git a/iRODS/lib/core/include/phybunUtil.hpp b/iRODS/lib/core/include/phybunUtil.hpp index b10204ea9c..08095d8ae3 100644 --- a/iRODS/lib/core/include/phybunUtil.hpp +++ b/iRODS/lib/core/include/phybunUtil.hpp @@ -5,9 +5,9 @@ #ifndef PHYBUN_UTIL_HPP #define PHYBUN_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef _WIN32 #include "sys/timeb.h" diff --git a/iRODS/lib/core/include/phymvUtil.hpp b/iRODS/lib/core/include/phymvUtil.hpp index 1da4182dea..8d6ed6833a 100644 --- a/iRODS/lib/core/include/phymvUtil.hpp +++ b/iRODS/lib/core/include/phymvUtil.hpp @@ -5,9 +5,9 @@ #ifndef PHYMVUTIL_HPP #define PHYMVUTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/procApiRequest.hpp b/iRODS/lib/core/include/procApiRequest.h similarity index 91% rename from iRODS/lib/core/include/procApiRequest.hpp rename to iRODS/lib/core/include/procApiRequest.h index 11348283b1..9368b493e3 100644 --- a/iRODS/lib/core/include/procApiRequest.hpp +++ b/iRODS/lib/core/include/procApiRequest.h @@ -6,10 +6,10 @@ -#ifndef PROC_API_REQUEST_HPP -#define PROC_API_REQUEST_HPP +#ifndef PROC_API_REQUEST_H__ +#define PROC_API_REQUEST_H__ -#include "rods.hpp" +#include "rods.h" #ifdef __cplusplus extern "C" { @@ -42,4 +42,4 @@ _cliGetCollOprStat( rcComm_t *conn, collOprStat_t **collOprStat ); } #endif -#endif /* PROC_API_REQUEST_H */ +#endif // PROC_API_REQUEST_H__ diff --git a/iRODS/lib/core/include/putUtil.hpp b/iRODS/lib/core/include/putUtil.hpp index 5dff129d3e..73791645fc 100644 --- a/iRODS/lib/core/include/putUtil.hpp +++ b/iRODS/lib/core/include/putUtil.hpp @@ -5,9 +5,9 @@ #ifndef PUT_UTIL_HPP #define PUT_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/rcConnect.hpp b/iRODS/lib/core/include/rcConnect.h similarity index 95% rename from iRODS/lib/core/include/rcConnect.hpp rename to iRODS/lib/core/include/rcConnect.h index c35e3206f5..b868592b4c 100644 --- a/iRODS/lib/core/include/rcConnect.hpp +++ b/iRODS/lib/core/include/rcConnect.h @@ -6,20 +6,19 @@ -#ifndef RC_CONNECT_HPP -#define RC_CONNECT_HPP +#ifndef RC_CONNECT_H__ +#define RC_CONNECT_H__ #include "rodsDef.h" -#include "rodsVersion.hpp" -#include "rodsError.hpp" -#include "rodsLog.hpp" -#include "stringOpr.hpp" -#include "rodsType.hpp" -#include "rodsUser.hpp" -#include "getRodsEnv.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" -#include "guiProgressCallback.hpp" +#include "rodsError.h" +#include "rodsLog.h" +#include "stringOpr.h" +#include "rodsType.h" +#include "rodsUser.h" +#include "getRodsEnv.h" +#include "objInfo.h" +#include "dataObjInpOut.h" +#include "guiProgressCallback.h" // =-=-=-=-=-=-=- // forard del of thread context @@ -39,9 +38,6 @@ struct thread_context; #define RECONN_TIMEOUT_TIME 600 /* re-connection timeout time in sec */ -#ifdef __cplusplus -extern "C" { -#endif typedef enum { PROCESSING_STATE, /* the process is not sending nor receiving */ RECEIVING_STATE, @@ -196,6 +192,10 @@ typedef struct { } rsComm_t; +#ifdef __cplusplus +extern "C" { +#endif + rcComm_t * rcConnect( const char *rodsHost, int rodsPort, const char *userName, const char *rodsZone, int reconnFlag, rErrMsg_t *errMsg ); @@ -263,4 +263,4 @@ isLoopbackAddress( const char* ip_address ); #ifdef __cplusplus } #endif -#endif /* RC_CONNECT_H */ +#endif // RC_CONNECT_H__ diff --git a/iRODS/lib/core/include/rcGlobal.hpp b/iRODS/lib/core/include/rcGlobal.hpp index cf79219990..730b1317f1 100644 --- a/iRODS/lib/core/include/rcGlobal.hpp +++ b/iRODS/lib/core/include/rcGlobal.hpp @@ -5,14 +5,14 @@ #ifndef RC_GLOBAL_HPP #define RC_GLOBAL_HPP -#include "rods.hpp" +#include "rods.h" #include "rodsPackTable.hpp" /* globally declare RodsPackTable */ //#include "apiPackTable.hpp" /* globally declare apiPackTable */ //#include "apiTable.hpp" /* contains global RsApiTable */ -#include "objInfo.hpp" -#include "rodsGenQuery.hpp" +#include "objInfo.h" +#include "rodsGenQuery.h" #include "rodsGeneralUpdate.hpp" -#include "guiProgressCallback.hpp" +#include "guiProgressCallback.h" int ProcessType = CLIENT_PT; diff --git a/iRODS/lib/core/include/rcGlobalExtern.hpp b/iRODS/lib/core/include/rcGlobalExtern.hpp index 616541348d..6d8663200a 100644 --- a/iRODS/lib/core/include/rcGlobalExtern.hpp +++ b/iRODS/lib/core/include/rcGlobalExtern.hpp @@ -5,11 +5,11 @@ #ifndef RC_GLOBAL_EXTERN_HPP #define RC_GLOBAL_EXTERN_HPP -#include "rods.hpp" +#include "rods.h" #include "packStruct.hpp" -#include "objInfo.hpp" +#include "objInfo.h" #include "msParam.hpp" -#include "guiProgressCallback.hpp" +#include "guiProgressCallback.h" extern packConstantArray_t PackConstantTable[]; extern const packInstructArray_t RodsPackTable[]; diff --git a/iRODS/lib/core/include/rcMisc.hpp b/iRODS/lib/core/include/rcMisc.hpp index f703809b77..9d8189c7cd 100644 --- a/iRODS/lib/core/include/rcMisc.hpp +++ b/iRODS/lib/core/include/rcMisc.hpp @@ -9,11 +9,11 @@ #ifndef RC_MISC_HPP #define RC_MISC_HPP -#include "rods.hpp" -#include "rodsError.hpp" -#include "objInfo.hpp" +#include "rods.h" +#include "rodsError.h" +#include "objInfo.h" #include "dataObjCopy.hpp" -#include "rodsPath.hpp" +#include "rodsPath.h" #include "bulkDataObjPut.hpp" #ifdef __cplusplus diff --git a/iRODS/lib/core/include/rcPortalOpr.hpp b/iRODS/lib/core/include/rcPortalOpr.hpp index ab4d77e1fe..4b216f7cca 100644 --- a/iRODS/lib/core/include/rcPortalOpr.hpp +++ b/iRODS/lib/core/include/rcPortalOpr.hpp @@ -9,10 +9,9 @@ #ifndef RC_PORTAL_OPR_HPP #define RC_PORTAL_OPR_HPP -#include "rods.hpp" -#include "rodsError.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "QUANTAnet_rbudpBase_c.hpp" #include "QUANTAnet_rbudpSender_c.hpp" #include "QUANTAnet_rbudpReceiver_c.hpp" diff --git a/iRODS/lib/core/include/regUtil.hpp b/iRODS/lib/core/include/regUtil.hpp index cce156e58d..5999e790cb 100644 --- a/iRODS/lib/core/include/regUtil.hpp +++ b/iRODS/lib/core/include/regUtil.hpp @@ -5,9 +5,9 @@ #ifndef REG_UTIL_HPP #define REG_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/replUtil.hpp b/iRODS/lib/core/include/replUtil.hpp index 81460a0840..768cbb89a4 100644 --- a/iRODS/lib/core/include/replUtil.hpp +++ b/iRODS/lib/core/include/replUtil.hpp @@ -5,9 +5,9 @@ #ifndef REPL_UTIL_HPP #define REPL_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/rmUtil.hpp b/iRODS/lib/core/include/rmUtil.hpp index c8d5bb4285..7c51a6661b 100644 --- a/iRODS/lib/core/include/rmUtil.hpp +++ b/iRODS/lib/core/include/rmUtil.hpp @@ -5,9 +5,9 @@ #ifndef RM_UTIL_HPP #define RM_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef _WIN32 #include "sys/timeb.h" diff --git a/iRODS/lib/core/include/rmtrashUtil.hpp b/iRODS/lib/core/include/rmtrashUtil.hpp index 6bdb20443d..7db35859b7 100644 --- a/iRODS/lib/core/include/rmtrashUtil.hpp +++ b/iRODS/lib/core/include/rmtrashUtil.hpp @@ -5,9 +5,9 @@ #ifndef RMTRASH_UTIL_HPP #define RMTRASH_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/rods.h b/iRODS/lib/core/include/rods.h new file mode 100644 index 0000000000..953a5b7322 --- /dev/null +++ b/iRODS/lib/core/include/rods.h @@ -0,0 +1,53 @@ +/*** Copyright (c), The Regents of the University of California *** + *** For more information please refer to files in the COPYRIGHT directory ***/ + +/* rods.h - common header file for rods + */ + + + +#ifndef RODS_H__ +#define RODS_H__ + +#include "rodsDef.h" +#include "rodsVersion.h" +#include "rodsError.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" +#include "stringOpr.h" +#include "rodsType.h" +#include "rodsKeyWdDef.h" +#include "objInfo.h" +#include "getRodsEnv.h" +#include "dataObjInpOut.h" +#include "rodsGenQuery.h" +#include "parseCommandLine.h" +#include "obf.h" +#include "rodsXmsg.h" +#include "rcConnect.h" + +#ifdef _WIN32 +#include +#include "winsock2.hpp" + +#ifndef snprintf +#define snprintf _snprintf +#endif // snprintf + +#ifndef vsnprintf +#define vsnprintf _vsnprintf +#endif // vsnprintf + +#ifndef strtoll +#define strtoll _strtoi64 +#endif // strtoll + +#ifndef random +#define random rand +#endif // random + +#endif // _WIN32 + + + +#endif // RODS_H__ diff --git a/iRODS/lib/core/include/rods.hpp b/iRODS/lib/core/include/rods.hpp deleted file mode 100644 index fa90cbd505..0000000000 --- a/iRODS/lib/core/include/rods.hpp +++ /dev/null @@ -1,64 +0,0 @@ -/*** Copyright (c), The Regents of the University of California *** - *** For more information please refer to files in the COPYRIGHT directory ***/ - -/* rods.h - common header file for rods - */ - - - -#ifndef RODS_HPP -#define RODS_HPP - -#include "rodsDef.h" -#include "rodsVersion.hpp" -#include "rodsError.hpp" -#include "rodsLog.hpp" -#include "stringOpr.hpp" -#include "rodsType.hpp" -#include "rodsKeyWdDef.hpp" -#include "objInfo.hpp" -#include "getRodsEnv.hpp" -#include "dataObjInpOut.hpp" -#include "rodsGenQuery.hpp" -#include "parseCommandLine.hpp" -#include "obf.hpp" -#include "rodsXmsg.hpp" -#include "rodsQuota.hpp" -#include "osauth.hpp" -#include "sslSockComm.hpp" - -#ifdef _WIN32 -#include "IRodsLib3.hpp" -#include -#include "winsock2.hpp" - -#if defined(_WIN32) -#ifndef snprintf -#define snprintf _snprintf -#endif snprintf -#endif _WIN32 - -#if defined(_WIN32) -#ifndef vsnprintf -#define vsnprintf _vsnprintf -#endif vsnprintf -#endif _WIN32 - -#if defined(_WIN32) -#ifndef strtoll -#define strtoll _strtoi64 -#endif strtoll -#endif _WIN32 - -#if defined(_WIN32) -#ifndef random -#define random rand -#endif random -#endif _WIN32 - - -#endif - - - -#endif /* RODS_H */ diff --git a/iRODS/lib/core/include/rodsClient.hpp b/iRODS/lib/core/include/rodsClient.h similarity index 85% rename from iRODS/lib/core/include/rodsClient.hpp rename to iRODS/lib/core/include/rodsClient.h index e94a1c51a8..65b3520167 100644 --- a/iRODS/lib/core/include/rodsClient.hpp +++ b/iRODS/lib/core/include/rodsClient.h @@ -6,10 +6,10 @@ -#ifndef RODS_CLIENT_HPP -#define RODS_CLIENT_HPP +#ifndef RODS_CLIENT_H__ +#define RODS_CLIENT_H__ -#include "rods.hpp" +#include "rods.h" #include "apiHeaderAll.hpp" /* Struct used to monitor transfer progress in getUtil and putUtil functions.*/ @@ -27,4 +27,4 @@ void init_client_api_table(); } #endif -#endif /* RODS_CLIENT_H */ +#endif /* RODS_CLIENT_H__ */ diff --git a/iRODS/lib/core/include/rodsError.hpp b/iRODS/lib/core/include/rodsError.h similarity index 87% rename from iRODS/lib/core/include/rodsError.hpp rename to iRODS/lib/core/include/rodsError.h index 05a5c5c747..a20adf973f 100644 --- a/iRODS/lib/core/include/rodsError.hpp +++ b/iRODS/lib/core/include/rodsError.h @@ -6,11 +6,10 @@ -#ifndef RODS_ERROR_HPP -#define RODS_ERROR_HPP +#ifndef RODS_ERROR_H__ +#define RODS_ERROR_H__ #define USE_EXTERN_TABLE -#include "rodsErrorTable.hpp" /* The error struct */ diff --git a/iRODS/lib/core/include/rodsErrorTable.hpp b/iRODS/lib/core/include/rodsErrorTable.h similarity index 99% rename from iRODS/lib/core/include/rodsErrorTable.hpp rename to iRODS/lib/core/include/rodsErrorTable.h index 06cdecab62..9031bf28ad 100644 --- a/iRODS/lib/core/include/rodsErrorTable.hpp +++ b/iRODS/lib/core/include/rodsErrorTable.h @@ -1,18 +1,18 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -/* rodsErrorTable.hpp - common header file for rods server and agents +/* rodsErrorTable.h - common header file for rods server and agents */ /** - * @file rodsErrorTable.hpp + * @file rodsErrorTable.h * * @brief Defines ERRORS for iRODS server and agents */ -#ifndef RODS_ERROR_TABLE_HPP -#define RODS_ERROR_TABLE_HPP +#ifndef RODS_ERROR_TABLE_H__ +#define RODS_ERROR_TABLE_H__ /** * @defgroup error_codes iRODS ERROR Codes @@ -823,5 +823,5 @@ #define SYS_NO_HANDLER_REPLY_MSG -99999999 /** @} */ -#endif /* RODS_ERROR_TABLE_HPP */ +#endif /* RODS_ERROR_TABLE_H__ */ diff --git a/iRODS/lib/core/include/rodsGenQuery.hpp b/iRODS/lib/core/include/rodsGenQuery.h similarity index 99% rename from iRODS/lib/core/include/rodsGenQuery.hpp rename to iRODS/lib/core/include/rodsGenQuery.h index 8cc55ec2f4..682c783cd5 100644 --- a/iRODS/lib/core/include/rodsGenQuery.hpp +++ b/iRODS/lib/core/include/rodsGenQuery.h @@ -7,10 +7,10 @@ -#ifndef RODS_GEN_QUERY_HPP -#define RODS_GEN_QUERY_HPP +#ifndef RODS_GEN_QUERY_H__ +#define RODS_GEN_QUERY_H__ -#include "objInfo.hpp" +#include "objInfo.h" #define MAX_SQL_ATTR 50 #define MAX_SQL_ROWS 256 @@ -537,4 +537,4 @@ primary ordering column. #define COL_TICKET_OWNER_NAME 2229 #define COL_TICKET_OWNER_ZONE 2230 -#endif /* RODS_GEN_QUERY_H */ +#endif /* RODS_GEN_QUERY_H__ */ diff --git a/iRODS/lib/core/include/rodsGenQueryNames.hpp b/iRODS/lib/core/include/rodsGenQueryNames.hpp index 118c65e731..74439f25b5 100644 --- a/iRODS/lib/core/include/rodsGenQueryNames.hpp +++ b/iRODS/lib/core/include/rodsGenQueryNames.hpp @@ -8,7 +8,7 @@ #ifndef GEN_QUERY_NAMES_HPP #define GEN_QUERY_NAMES_HPP -#include "rodsGenQuery.hpp" +#include "rodsGenQuery.h" typedef struct { int columnId; diff --git a/iRODS/lib/core/include/rodsGeneralUpdate.hpp b/iRODS/lib/core/include/rodsGeneralUpdate.hpp index 7a162c36d7..d2790bdff9 100644 --- a/iRODS/lib/core/include/rodsGeneralUpdate.hpp +++ b/iRODS/lib/core/include/rodsGeneralUpdate.hpp @@ -9,9 +9,9 @@ #ifndef RODS_GENERAL_UPDATE_HPP #define RODS_GENERAL_UPDATE_HPP -#include "objInfo.hpp" +#include "objInfo.h" -#include "rodsGenQuery.hpp" +#include "rodsGenQuery.h" /* Unusual values since don't want caller to accidentally select wrong call: */ #define GENERAL_UPDATE_INSERT 23451 diff --git a/iRODS/lib/core/include/rodsKeyWdDef.hpp b/iRODS/lib/core/include/rodsKeyWdDef.h similarity index 99% rename from iRODS/lib/core/include/rodsKeyWdDef.hpp rename to iRODS/lib/core/include/rodsKeyWdDef.h index e9ca402c9a..9bcffa0c4c 100644 --- a/iRODS/lib/core/include/rodsKeyWdDef.hpp +++ b/iRODS/lib/core/include/rodsKeyWdDef.h @@ -2,8 +2,8 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* rodsKeyWdDef.h - global definition for client API */ -#ifndef RODS_KEYWD_DEF -#define RODS_KEYWD_DEF +#ifndef RODS_KEYWD_DEF_H__ +#define RODS_KEYWD_DEF_H__ /* The following are the keyWord definition for the condInput key/value pair */ @@ -97,14 +97,14 @@ #define NON_BULK_OPR_KW "nonBulkOpr" /* non bulk operation */ #define EXEC_CMD_RULE_KW "execCmdRule" /* the rule that invoke execCmd */ #define EXEC_MY_RULE_KW "execMyRule" /* the rule is invoked by rsExecMyRule */ -#define STREAM_STDOUT_KW "streamStdout" /* the stream stdout for +#define STREAM_STDOUT_KW "streamStdout" /* the stream stdout for * execCmd */ #define REG_REPL_KW "regRepl" /* register replica */ #define AGE_KW "age" /* age of the file for itrim */ #define DRYRUN_KW "dryrun" /* do a dry run */ -#define ACL_COLLECTION_KW "aclCollection" /* the collection from which +#define ACL_COLLECTION_KW "aclCollection" /* the collection from which * the ACL should be used */ -#define NO_CHK_COPY_LEN_KW "noChkCopyLen" /* Don't check the len +#define NO_CHK_COPY_LEN_KW "noChkCopyLen" /* Don't check the len * when transfering */ #define TICKET_KW "ticket" /* for ticket-based-access */ #define PURGE_CACHE_KW "purgeCache" /* purge the cache copy right JMC - backport 4537 @@ -284,4 +284,4 @@ #define KEY_VALUE_PASSTHROUGH_KW "key_value_passthrough" #define DISABLE_STRICT_ACL_KW "disable_strict_acls" -#endif /* RODS_KEYWD_DEF */ +#endif // RODS_KEYWD_DEF_H__ diff --git a/iRODS/lib/core/include/rodsLog.hpp b/iRODS/lib/core/include/rodsLog.h similarity index 96% rename from iRODS/lib/core/include/rodsLog.hpp rename to iRODS/lib/core/include/rodsLog.h index fbcd6cd67e..3d0e022ce3 100644 --- a/iRODS/lib/core/include/rodsLog.hpp +++ b/iRODS/lib/core/include/rodsLog.h @@ -1,8 +1,10 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ /* definitions for rodsLog routines */ +#ifndef RODS_LOG_H__ +#define RODS_LOG_H__ -#include "rodsError.hpp" +#include "rodsError.h" #define LOG_SQL 11 /* This is for logging SQL statements. These are only logged when @@ -62,3 +64,5 @@ void generateLogTimestamp( char *ts, int tsLen ); #ifdef __cplusplus } #endif + +#endif // RODS_LOG_H__ diff --git a/iRODS/lib/core/include/rodsPackInstruct.hpp b/iRODS/lib/core/include/rodsPackInstruct.h similarity index 99% rename from iRODS/lib/core/include/rodsPackInstruct.hpp rename to iRODS/lib/core/include/rodsPackInstruct.h index e3fb4d2d66..df6e67929d 100644 --- a/iRODS/lib/core/include/rodsPackInstruct.hpp +++ b/iRODS/lib/core/include/rodsPackInstruct.h @@ -6,8 +6,8 @@ -#ifndef PACK_INSTRUCT_HPP -#define PACK_INSTRUCT_HPP +#ifndef PACK_INSTRUCT_H__ +#define PACK_INSTRUCT_H__ #define IRODS_STR_PI "str myStr[MAX_NAME_LEN];" #define STR_PI "str myStr;" @@ -105,24 +105,15 @@ #define TagStruct_PI "int ssLen; str *preTag[ssLen]; str *postTag[ssLen]; str *keyWord[ssLen];" - - - #define RodsObjStat_PI "double objSize; int objType; int dataMode; str dataId[NAME_LEN]; str chksum[NAME_LEN]; str ownerName[NAME_LEN]; str ownerZone[NAME_LEN]; str createTime[TIME_LEN]; str modifyTime[TIME_LEN]; struct *SpecColl_PI;" - - - - #define ReconnMsg_PI "int status; int cookie; int procState; int flag;" #define VaultPathPolicy_PI "int scheme; int addUserName; int trimDirCnt;" #define StrArray_PI "int len; int size; str *value(len)(size);" #define IntArray_PI "int len; int *value(len);" - #define SpecColl_PI "int collClass; int type; str collection[MAX_NAME_LEN]; str objPath[MAX_NAME_LEN]; str resource[NAME_LEN]; str rescHier[MAX_NAME_LEN]; str phyPath[MAX_NAME_LEN]; str cacheDir[MAX_NAME_LEN]; int cacheDirty; int replNum;" - #define SubFile_PI "struct RHostAddr_PI; str subFilePath[MAX_NAME_LEN]; int mode; int flags; double offset; struct *SpecColl_PI;" #define XmsgTicketInfo_PI "int sendTicket; int rcvTicket; int expireTime; int flag;" #define SendXmsgInfo_PI "int msgNumber; str msgType[HEADER_TYPE_LEN]; int numRcv; int flag; str *msg; int numDel; str *delAddress[numDel]; int *delPort(numDel); str *miscInfo;" @@ -151,4 +142,4 @@ #define MsrvcStruct_PI "int maxNumOfMsrvcs; double msrvcId[maxNumOfMsrvcs]; str moduleName[maxNumOfMsrvcs]; str msrvcName[maxNumOfMsrvcs]; str msrvcSiganture[maxNumOfMsrvcs]; str msrvcVersion[maxNumOfMsrvcs]; str msrvcHost[maxNumOfMsrvcs]; str msrvcLocation[maxNumOfMsrvcs]; str msrvcLanguage[maxNumOfMsrvcs]; str msrvcTypeName[maxNumOfMsrvcs]; double msrvcStatus[maxNumOfMsrvcs];" #define DataSeg_PI "double len; double offset;" #define FileRestartInfo_PI "str fileName[MAX_NAME_LEN]; str objPath[MAX_NAME_LEN]; int numSeg; int flags; double fileSize; struct DataSeg_PI[numSeg];" -#endif /* PACK_INSTRUCT_H */ +#endif /* PACK_INSTRUCT_H__ */ diff --git a/iRODS/lib/core/include/rodsPackTable.hpp b/iRODS/lib/core/include/rodsPackTable.hpp index c2cc76be1c..79ade7167b 100644 --- a/iRODS/lib/core/include/rodsPackTable.hpp +++ b/iRODS/lib/core/include/rodsPackTable.hpp @@ -6,10 +6,10 @@ #ifndef RODS_PACK_TABLE_HPP #define RODS_PACK_TABLE_HPP -#include "rods.hpp" +#include "rods.h" #include "packStruct.hpp" -#include "rodsPackInstruct.hpp" -#include "rodsGenQuery.hpp" +#include "rodsPackInstruct.h" +#include "rodsGenQuery.h" #include "reGlobalsExtern.hpp" #include "apiHeaderAll.hpp" diff --git a/iRODS/lib/core/include/rodsPath.hpp b/iRODS/lib/core/include/rodsPath.h similarity index 82% rename from iRODS/lib/core/include/rodsPath.hpp rename to iRODS/lib/core/include/rodsPath.h index f7955fb077..05608b91df 100644 --- a/iRODS/lib/core/include/rodsPath.hpp +++ b/iRODS/lib/core/include/rodsPath.h @@ -1,24 +1,13 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#ifndef RODS_PATH_HPP -#define RODS_PATH_HPP +#ifndef RODS_PATH_H__ +#define RODS_PATH_H__ #include "rodsDef.h" -#include "rods.hpp" -#include "getRodsEnv.hpp" -#include "rodsType.hpp" -#include "objStat.hpp" - -#if 0 -#include -#include -#include -#include -#include -#include -using namespace std; -using namespace boost::filesystem; -#endif +#include "rods.h" +#include "getRodsEnv.h" +#include "rodsType.h" +#include "objStat.h" #ifdef __cplusplus extern "C" { @@ -79,4 +68,4 @@ clearRodsPath( rodsPath_t *rodsPath ); } #endif -#endif /* RODS_PATH_H*/ +#endif // RODS_PATH_H__ diff --git a/iRODS/lib/core/include/rodsQuota.hpp b/iRODS/lib/core/include/rodsQuota.h similarity index 85% rename from iRODS/lib/core/include/rodsQuota.hpp rename to iRODS/lib/core/include/rodsQuota.h index 18bb570f65..252516bcff 100644 --- a/iRODS/lib/core/include/rodsQuota.hpp +++ b/iRODS/lib/core/include/rodsQuota.h @@ -6,11 +6,11 @@ -#ifndef RODS_QUOTA_HPP -#define RODS_QUOTA_HPP +#ifndef RODS_QUOTA_H__ +#define RODS_QUOTA_H__ #define QUOTA_UNRESTRICTED 0 /* no restrictions on this user&resc */ #define QUOTA_RESOURCE 1 /* resource specific quota */ #define QUOTA_GLOBAL 2 /* global (total usage) type quota */ -#endif /* RODS_QUOTA_H */ +#endif /* RODS_QUOTA_H__ */ diff --git a/iRODS/lib/core/include/rodsType.hpp b/iRODS/lib/core/include/rodsType.h similarity index 97% rename from iRODS/lib/core/include/rodsType.hpp rename to iRODS/lib/core/include/rodsType.h index 7775b1b9f0..0eeb360a6d 100644 --- a/iRODS/lib/core/include/rodsType.hpp +++ b/iRODS/lib/core/include/rodsType.h @@ -6,8 +6,8 @@ -#ifndef RODS_TYPE_HPP -#define RODS_TYPE_HPP +#ifndef RODS_TYPE_H__ +#define RODS_TYPE_H__ #include #if defined(solaris_platform) || defined(aix_platform) @@ -81,4 +81,4 @@ typedef struct rodsDirent { char d_name[DIR_LEN]; } rodsDirent_t; -#endif /* RODS_TYPE_H */ +#endif /* RODS_TYPE_H__ */ diff --git a/iRODS/lib/core/include/rodsUser.hpp b/iRODS/lib/core/include/rodsUser.h similarity index 96% rename from iRODS/lib/core/include/rodsUser.hpp rename to iRODS/lib/core/include/rodsUser.h index b41daeb97f..5088888d0f 100644 --- a/iRODS/lib/core/include/rodsUser.hpp +++ b/iRODS/lib/core/include/rodsUser.h @@ -6,8 +6,8 @@ -#ifndef RODS_USER_HPP -#define RODS_USER_HPP +#ifndef RODS_USER_H__ +#define RODS_USER_H__ #include "rodsDef.h" @@ -73,4 +73,4 @@ typedef struct { } userInfo_t; -#endif /* RODS_USER_H */ +#endif /* RODS_USER_H__ */ diff --git a/iRODS/lib/core/include/rodsVersion.hpp.template b/iRODS/lib/core/include/rodsVersion.h.template similarity index 75% rename from iRODS/lib/core/include/rodsVersion.hpp.template rename to iRODS/lib/core/include/rodsVersion.h.template index 4408c5fc31..6365ad3bb3 100644 --- a/iRODS/lib/core/include/rodsVersion.hpp.template +++ b/iRODS/lib/core/include/rodsVersion.h.template @@ -1,13 +1,13 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -/* rodsVersion.hpp - defines the release version and API version +/* rodsVersion.h - defines the release version and API version */ -#ifndef RODS_VERSION_HPP -#define RODS_VERSION_HPP +#ifndef RODS_VERSION_H__ +#define RODS_VERSION_H__ #define RODS_REL_VERSION "rodsTEMPLATE_RODS_RELEASE_VERSION" #define RODS_API_VERSION "d" diff --git a/iRODS/lib/core/include/rodsXmsg.h b/iRODS/lib/core/include/rodsXmsg.h new file mode 100644 index 0000000000..964cd3c462 --- /dev/null +++ b/iRODS/lib/core/include/rodsXmsg.h @@ -0,0 +1,105 @@ +/*** Copyright (c), The Regents of the University of California *** + *** For more information please refer to files in the COPYRIGHT directory ***/ +/* rodsXmsg.h - Header for for xmsg */ + +#ifndef RODS_XMSG_H__ +#define RODS_XMSG_H__ + +#define DEF_EXPIRE_INT (3600 * 4) // default expire interval +#define MAX_EXPIRE_INT (3600 * 48) // max expire interval +#define INC_EXPIRE_INT (3600 * 2) // minimum inteval after new inteval was sent +// definition for msgNumber +#define ANY_MSG_NUMBER 0 // get the msg with the smallest msgNumber + +typedef struct { + uint expireTime; // unix time of ticket expiration + uint flag; // flag set to XmsgTicketInfo.flag +} getXmsgTicketInp_t; + +// definition for XmsgTicketInfo.flag +#define SINGLE_MSG_TICKET 0 // ticket for just a single msg. ticket will be + // deleted after the msg is received +#define MULTI_MSG_TICKET 1 // ticket for MULTIPLE MSG +typedef struct XmsgTicketInfo { + uint sendTicket; + uint rcvTicket; + uint expireTime; // unix time of ticket expiration + uint flag; +} xmsgTicketInfo_t; + +typedef struct SendXmsgInfo { + uint msgNumber; + char msgType[HEADER_TYPE_LEN]; // msg type, 16 char + uint numRcv; // number of receiver + int flag; // not used by client + char *msg; // the msg + int numDeli; // number of msg to deliver + char **deliAddress; // array of str pointer of addr + uint *deliPort; // array of port number to deliver + char *miscInfo; // for expiration, etc +} sendXmsgInfo_t; + +typedef struct { + xmsgTicketInfo_t ticket; // xmsgTicketInfo from getXmsgTicket + char sendAddr[NAME_LEN]; // send Addr can contain pid after + sendXmsgInfo_t sendXmsgInfo; +} sendXmsgInp_t; + +/* xmsg struct */ + +typedef struct IrodsXmsg { + sendXmsgInfo_t *sendXmsgInfo; + uint sendTime; // unix time of the send + char sendUserName[NAME_LEN]; // userName@zone of clientUser + char sendAddr[NAME_LEN]; // sender's network address + struct IrodsXmsg *prev; // the link list with XmsgReqHead + struct IrodsXmsg *next; + struct IrodsXmsg *tnext; // the link list within the same ticket (diff msgNumber) + struct IrodsXmsg *tprev; + uint seqNumber; + void *ticketMsgStruct; // points to the ticketMsgStruct_t this xmsg belongs +} irodsXmsg_t; + +typedef struct XmsgQue { + irodsXmsg_t *head; + irodsXmsg_t *tail; +} xmsgQue_t; + +typedef struct TicketMsgStruct { + xmsgTicketInfo_t ticket; + xmsgQue_t xmsgQue; // the link list of msg with the same ticket + struct TicketMsgStruct *hprev; // the hash link list. sort by rcvTicket + struct TicketMsgStruct *hnext; + void *ticketHashQue; // points to the ticketHashQue_t this ticket belongs + uint nxtSeqNumber; +} ticketMsgStruct_t; + +// queue of msg hashed to the same slot +typedef struct TicketHashQue { + ticketMsgStruct_t *head; + ticketMsgStruct_t *tail; +} ticketHashQue_t; + +typedef struct XmsgReq { + int sock; + struct XmsgReq *next; +} xmsgReq_t; + +typedef struct RcvXmsgInp { + uint rcvTicket; + uint msgNumber; + uint seqNumber; + char msgCondition[MAX_NAME_LEN]; +} rcvXmsgInp_t; + +typedef struct RcvXmsgOut { + char msgType[HEADER_TYPE_LEN]; // msg type, 16 char + char sendUserName[NAME_LEN]; // userName@zone of clientUser + char sendAddr[NAME_LEN]; // sender's network address + uint msgNumber; // msgNumber as set by sender + uint seqNumber; // internal sequence number + char *msg; // the msg +} rcvXmsgOut_t; + + +#endif // RODS_XMSG_H__ diff --git a/iRODS/lib/core/include/rodsXmsg.hpp b/iRODS/lib/core/include/rodsXmsg.hpp deleted file mode 100644 index e7eeebc74c..0000000000 --- a/iRODS/lib/core/include/rodsXmsg.hpp +++ /dev/null @@ -1,110 +0,0 @@ -/*** Copyright (c), The Regents of the University of California *** - *** For more information please refer to files in the COPYRIGHT directory ***/ -/* rodsXmsg.h - Header for for xmsg */ - -#ifndef RODS_XMSG_HPP -#define RODS_XMSG_HPP - -#define DEF_EXPIRE_INT (3600 * 4) /* default expire interval */ -#define MAX_EXPIRE_INT (3600 * 48) /* max expire interval */ -#define INC_EXPIRE_INT (3600 * 2) /* minimum inteval after new inteval -* was sent */ -/* definition for msgNumber */ -#define ANY_MSG_NUMBER 0 /* get the msg with the smallest -* msgNumber */ -typedef struct { - uint expireTime; /* unix time of ticket expiration */ - uint flag; /* flag set to XmsgTicketInfo.flag */ -} getXmsgTicketInp_t; - -/* definition for XmsgTicketInfo.flag */ -#define SINGLE_MSG_TICKET 0 /* ticket for just a single msg. ticket will -* be deleted after the msg is received */ -#define MULTI_MSG_TICKET 1 /* ticket for MULTIPLE MSG */ -typedef struct XmsgTicketInfo { - uint sendTicket; - uint rcvTicket; - uint expireTime; /* unix time of ticket expiration */ - uint flag; -} xmsgTicketInfo_t; - -typedef struct SendXmsgInfo { - uint msgNumber; - char msgType[HEADER_TYPE_LEN]; /* msg type, 16 char */ - uint numRcv; /* number of receiver */ - int flag; /* not used by client */ - char *msg; /* the msg */ - int numDeli; /* number of msg to deliver */ - char **deliAddress; /* array of str pointer of addr */ - uint *deliPort; /* array of port number to deliver */ - char *miscInfo; /* for expiration, etc */ -} sendXmsgInfo_t; - -typedef struct { - xmsgTicketInfo_t ticket; /* xmsgTicketInfo from getXmsgTicket */ - char sendAddr[NAME_LEN]; /* send Addr can contain pid after: */ - sendXmsgInfo_t sendXmsgInfo; -} sendXmsgInp_t; - -/* xmsg struct */ - -typedef struct IrodsXmsg { - sendXmsgInfo_t *sendXmsgInfo; - uint sendTime; /* unix time of the send */ - char sendUserName[NAME_LEN]; /* userName@zone of clientUser */ - char sendAddr[NAME_LEN]; /* sender's network address*/ - struct IrodsXmsg *prev; /* the link list with XmsgReqHead */ - struct IrodsXmsg *next; - struct IrodsXmsg *tnext; /* the link list within the same - * ticket (diff msgNumber) */ - struct IrodsXmsg *tprev; - uint seqNumber; - void *ticketMsgStruct; /* points to the ticketMsgStruct_t this - * xmsg belongs */ -} irodsXmsg_t; - -typedef struct XmsgQue { - irodsXmsg_t *head; - irodsXmsg_t *tail; -} xmsgQue_t; - -typedef struct TicketMsgStruct { - xmsgTicketInfo_t ticket; - xmsgQue_t xmsgQue; /* the link list of msg with the same ticket */ - struct TicketMsgStruct *hprev; /* the hash link list. sort by rcvTicket - */ - struct TicketMsgStruct *hnext; - void *ticketHashQue; /* points to the ticketHashQue_t this ticket - * belongs */ - uint nxtSeqNumber; -} ticketMsgStruct_t; - -/* queue of msg hashed to the same slot */ -typedef struct TicketHashQue { - ticketMsgStruct_t *head; - ticketMsgStruct_t *tail; -} ticketHashQue_t; - -typedef struct XmsgReq { - int sock; - struct XmsgReq *next; -} xmsgReq_t; - -typedef struct RcvXmsgInp { - uint rcvTicket; - uint msgNumber; - uint seqNumber; - char msgCondition[MAX_NAME_LEN]; -} rcvXmsgInp_t; - -typedef struct RcvXmsgOut { - char msgType[HEADER_TYPE_LEN]; /* msg type, 16 char */ - char sendUserName[NAME_LEN]; /* userName@zone of clientUser */ - char sendAddr[NAME_LEN]; /* sender's network address*/ - uint msgNumber; /* msgNumber as set by sender */ - uint seqNumber; /* internal sequence number */ - char *msg; /* the msg */ -} rcvXmsgOut_t; - - -#endif /* RODS_XMSG_H */ diff --git a/iRODS/lib/core/include/rsyncUtil.hpp b/iRODS/lib/core/include/rsyncUtil.hpp index f39842350b..5b4036ffb3 100644 --- a/iRODS/lib/core/include/rsyncUtil.hpp +++ b/iRODS/lib/core/include/rsyncUtil.hpp @@ -5,9 +5,9 @@ #ifndef RSYNC_UTIL_HPP #define RSYNC_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/scanUtil.hpp b/iRODS/lib/core/include/scanUtil.hpp index 561f1e2de7..c274bdcf93 100644 --- a/iRODS/lib/core/include/scanUtil.hpp +++ b/iRODS/lib/core/include/scanUtil.hpp @@ -5,9 +5,9 @@ #ifndef SCAN_UTIL_HPP #define SCAN_UTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/include/sockComm.hpp b/iRODS/lib/core/include/sockComm.h similarity index 96% rename from iRODS/lib/core/include/sockComm.hpp rename to iRODS/lib/core/include/sockComm.h index b85422a533..7b9d435612 100644 --- a/iRODS/lib/core/include/sockComm.hpp +++ b/iRODS/lib/core/include/sockComm.h @@ -3,14 +3,14 @@ /* sockComm.h - header file for sockComm.c */ -#ifndef SOCK_COMM_HPP -#define SOCK_COMM_HPP +#ifndef SOCK_COMM_H__ +#define SOCK_COMM_H__ // =-=-=-=-=-=-= // irods includes #include "rodsDef.h" -#include "rcConnect.hpp" -#include "rodsPackInstruct.hpp" +#include "rcConnect.h" +#include "rodsPackInstruct.h" #define MAX_LISTEN_QUE 50 #define SOCK_WINDOW_SIZE (1*1024*1024) /* sock window size = 1 Mb */ @@ -80,4 +80,4 @@ int mySockClose( int sock ); // server stop fcn <==> rsAccept? } #endif -#endif /* SOCK_COMM_H */ +#endif /* SOCK_COMM_H__ */ diff --git a/iRODS/lib/core/include/sslSockComm.hpp b/iRODS/lib/core/include/sslSockComm.h similarity index 90% rename from iRODS/lib/core/include/sslSockComm.hpp rename to iRODS/lib/core/include/sslSockComm.h index d2e1ae329b..176bda972d 100644 --- a/iRODS/lib/core/include/sslSockComm.hpp +++ b/iRODS/lib/core/include/sslSockComm.h @@ -3,16 +3,16 @@ /* sslSockComm.h - header file for sslSockComm.c */ -#ifndef SSL_SOCK_COMM_HPP -#define SSL_SOCK_COMM_HPP +#ifndef SSL_SOCK_COMM_H__ +#define SSL_SOCK_COMM_H__ #include #include #include #include "rodsDef.h" -#include "rcConnect.hpp" -#include "rodsPackInstruct.hpp" +#include "rcConnect.h" +#include "rodsPackInstruct.h" #define SSL_CIPHER_LIST "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" @@ -51,4 +51,4 @@ sslWrite( void *buf, int len, } #endif -#endif /* SSL_SOCK_COMM_H */ +#endif /* SSL_SOCK_COMM_H__ */ diff --git a/iRODS/lib/core/include/stringOpr.hpp b/iRODS/lib/core/include/stringOpr.h similarity index 93% rename from iRODS/lib/core/include/stringOpr.hpp rename to iRODS/lib/core/include/stringOpr.h index 6cdb1ca554..54fa39453c 100644 --- a/iRODS/lib/core/include/stringOpr.hpp +++ b/iRODS/lib/core/include/stringOpr.h @@ -6,8 +6,8 @@ -#ifndef STRING_OPR_HPP -#define STRING_OPR_HPP +#ifndef STRING_OPR_H__ +#define STRING_OPR_H__ #include "rodsDef.h" @@ -39,4 +39,4 @@ checkStringForEmailAddress( const char *inString ); #ifdef __cplusplus } #endif -#endif /* STRING_OPR_H */ +#endif /* STRING_OPR_H__ */ diff --git a/iRODS/lib/core/include/trimUtil.hpp b/iRODS/lib/core/include/trimUtil.hpp index 2798adb8c6..248f55c947 100644 --- a/iRODS/lib/core/include/trimUtil.hpp +++ b/iRODS/lib/core/include/trimUtil.hpp @@ -5,9 +5,9 @@ #ifndef TRIMUTIL_HPP #define TRIMUTIL_HPP -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" -#include "rodsPath.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" +#include "rodsPath.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/core/src/base64.cpp b/iRODS/lib/core/src/base64.cpp index b1808ad417..9445f3f04e 100644 --- a/iRODS/lib/core/src/base64.cpp +++ b/iRODS/lib/core/src/base64.cpp @@ -2,7 +2,7 @@ * SiFang */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "base64.hpp" #define OK 0 diff --git a/iRODS/lib/core/src/bunUtil.cpp b/iRODS/lib/core/src/bunUtil.cpp index 26b9a91edd..4f88df4be3 100644 --- a/iRODS/lib/core/src/bunUtil.cpp +++ b/iRODS/lib/core/src/bunUtil.cpp @@ -1,8 +1,8 @@ /*** Copyright (c), The BunOprents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "bunUtil.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/core/src/chksumUtil.cpp b/iRODS/lib/core/src/chksumUtil.cpp index 729b78a624..bf1592789b 100644 --- a/iRODS/lib/core/src/chksumUtil.cpp +++ b/iRODS/lib/core/src/chksumUtil.cpp @@ -3,10 +3,10 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" #include "miscUtil.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "chksumUtil.hpp" static int ChksumCnt = 0; diff --git a/iRODS/lib/core/src/clientLogin.cpp b/iRODS/lib/core/src/clientLogin.cpp index f68eeb44f1..604776cd1c 100644 --- a/iRODS/lib/core/src/clientLogin.cpp +++ b/iRODS/lib/core/src/clientLogin.cpp @@ -8,8 +8,8 @@ // =-=-=-=-=-=-=- // irods includes -#include "rodsClient.hpp" -#include "sslSockComm.hpp" +#include "rodsClient.h" +#include "sslSockComm.h" // =-=-=-=-=-=-=- #include "irods_auth_object.hpp" diff --git a/iRODS/lib/core/src/cpUtil.cpp b/iRODS/lib/core/src/cpUtil.cpp index 0318b11bc8..38820d5a47 100644 --- a/iRODS/lib/core/src/cpUtil.cpp +++ b/iRODS/lib/core/src/cpUtil.cpp @@ -3,9 +3,9 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "miscUtil.hpp" #include "cpUtil.hpp" diff --git a/iRODS/lib/core/src/fsckUtil.cpp b/iRODS/lib/core/src/fsckUtil.cpp index dbbc18a092..6d8edd46b6 100644 --- a/iRODS/lib/core/src/fsckUtil.cpp +++ b/iRODS/lib/core/src/fsckUtil.cpp @@ -2,9 +2,9 @@ *** For full copyright notice please refer to files in the COPYRIGHT directory ***/ /* Written by Jean-Yves Nief of CCIN2P3 and copyright assigned to Data Intensive Cyberinfrastructure Foundation */ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "fsckUtil.hpp" #include "miscUtil.hpp" #include "checksum.hpp" diff --git a/iRODS/lib/core/src/getRodsEnv.cpp b/iRODS/lib/core/src/getRodsEnv.cpp index efb036d925..65d3bc2a19 100644 --- a/iRODS/lib/core/src/getRodsEnv.cpp +++ b/iRODS/lib/core/src/getRodsEnv.cpp @@ -24,10 +24,10 @@ the env file, either creating it or appending to it. */ -#include "rods.hpp" -#include "rodsErrorTable.hpp" -#include "getRodsEnv.hpp" -#include "rodsLog.hpp" +#include "rods.h" +#include "rodsErrorTable.h" +#include "getRodsEnv.h" +#include "rodsLog.h" #include "irods_log.hpp" #include "irods_environment_properties.hpp" #include "irods_configuration_keywords.hpp" diff --git a/iRODS/lib/core/src/getUtil.cpp b/iRODS/lib/core/src/getUtil.cpp index 1e6c65e7b1..1754acde89 100644 --- a/iRODS/lib/core/src/getUtil.cpp +++ b/iRODS/lib/core/src/getUtil.cpp @@ -3,14 +3,14 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "lsUtil.hpp" #include "getUtil.hpp" #include "miscUtil.hpp" #include "rcPortalOpr.hpp" -#include "sockComm.hpp" +#include "sockComm.h" int setSessionTicket( rcComm_t *myConn, char *ticket ) { diff --git a/iRODS/lib/core/src/irods_children_parser.cpp b/iRODS/lib/core/src/irods_children_parser.cpp index 7258f3d9aa..8c43c6ce08 100644 --- a/iRODS/lib/core/src/irods_children_parser.cpp +++ b/iRODS/lib/core/src/irods_children_parser.cpp @@ -1,6 +1,6 @@ #include "irods_children_parser.hpp" #include "irods_log.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include #include diff --git a/iRODS/lib/core/src/irods_client_negotiation.cpp b/iRODS/lib/core/src/irods_client_negotiation.cpp index 86b4de95fd..d9707f8dc3 100644 --- a/iRODS/lib/core/src/irods_client_negotiation.cpp +++ b/iRODS/lib/core/src/irods_client_negotiation.cpp @@ -6,7 +6,7 @@ #include "irods_buffer_encryption.hpp" #include "irods_hasher_factory.hpp" #include "MD5Strategy.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include "sockCommNetworkInterface.hpp" // =-=-=-=-=-=-=- diff --git a/iRODS/lib/core/src/irods_environment_properties.cpp b/iRODS/lib/core/src/irods_environment_properties.cpp index ab28f15896..9d8eb8c437 100644 --- a/iRODS/lib/core/src/irods_environment_properties.cpp +++ b/iRODS/lib/core/src/irods_environment_properties.cpp @@ -6,7 +6,7 @@ #include "irods_environment_properties.hpp" #include "irods_get_full_path_for_config_file.hpp" -#include "rods.hpp" +#include "rods.h" #include "irods_log.hpp" #include "irods_lookup_table.hpp" #include "irods_home_directory.hpp" diff --git a/iRODS/lib/core/src/irods_error.cpp b/iRODS/lib/core/src/irods_error.cpp index a1b7f862e7..9a256e4f8a 100644 --- a/iRODS/lib/core/src/irods_error.cpp +++ b/iRODS/lib/core/src/irods_error.cpp @@ -3,7 +3,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rodsLog.hpp" +#include "rodsLog.h" // =-=-=-=-=-=-=- // boost includes diff --git a/iRODS/lib/core/src/irods_get_full_path_for_config_file.cpp b/iRODS/lib/core/src/irods_get_full_path_for_config_file.cpp index f2fa79f121..cf243466f5 100644 --- a/iRODS/lib/core/src/irods_get_full_path_for_config_file.cpp +++ b/iRODS/lib/core/src/irods_get_full_path_for_config_file.cpp @@ -10,6 +10,7 @@ // =-=-=-=-=-=-=- // irods includes +#include "rodsErrorTable.h" #include "irods_log.hpp" #include "irods_home_directory.hpp" #include "irods_get_full_path_for_config_file.hpp" diff --git a/iRODS/lib/core/src/irods_hierarchy_parser.cpp b/iRODS/lib/core/src/irods_hierarchy_parser.cpp index 7791b43ef7..5d748b7ff1 100644 --- a/iRODS/lib/core/src/irods_hierarchy_parser.cpp +++ b/iRODS/lib/core/src/irods_hierarchy_parser.cpp @@ -1,6 +1,6 @@ #include "irods_hierarchy_parser.hpp" #include "irods_string_tokenize.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "irods_log.hpp" #include diff --git a/iRODS/lib/core/src/irods_kvp_string_parser.cpp b/iRODS/lib/core/src/irods_kvp_string_parser.cpp index 9a7e8df5c8..8b116918f4 100644 --- a/iRODS/lib/core/src/irods_kvp_string_parser.cpp +++ b/iRODS/lib/core/src/irods_kvp_string_parser.cpp @@ -6,7 +6,7 @@ // =-=-=-=-=-=-=- // rods includes -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include #include #include diff --git a/iRODS/lib/core/src/irods_log.cpp b/iRODS/lib/core/src/irods_log.cpp index d1a74db662..008f84c3db 100644 --- a/iRODS/lib/core/src/irods_log.cpp +++ b/iRODS/lib/core/src/irods_log.cpp @@ -3,7 +3,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rodsLog.hpp" +#include "rodsLog.h" namespace irods { diff --git a/iRODS/lib/core/src/irods_parse_command_line_options.cpp b/iRODS/lib/core/src/irods_parse_command_line_options.cpp index 3daeb54426..96ef4fc590 100644 --- a/iRODS/lib/core/src/irods_parse_command_line_options.cpp +++ b/iRODS/lib/core/src/irods_parse_command_line_options.cpp @@ -1,4 +1,4 @@ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "irods_parse_command_line_options.hpp" #include "boost/program_options.hpp" diff --git a/iRODS/lib/core/src/irods_plugin_name_generator.cpp b/iRODS/lib/core/src/irods_plugin_name_generator.cpp index ababe07173..298758ad98 100644 --- a/iRODS/lib/core/src/irods_plugin_name_generator.cpp +++ b/iRODS/lib/core/src/irods_plugin_name_generator.cpp @@ -1,7 +1,7 @@ #include "irods_plugin_name_generator.hpp" #include "irods_log.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #ifndef BOOST_ASSERT_MSG #define BOOST_ASSERT_MSG( cond, msg ) do \ diff --git a/iRODS/lib/core/src/irods_serialization.cpp b/iRODS/lib/core/src/irods_serialization.cpp index 148284fd51..e1ed972694 100644 --- a/iRODS/lib/core/src/irods_serialization.cpp +++ b/iRODS/lib/core/src/irods_serialization.cpp @@ -5,7 +5,7 @@ #include #include "irods_serialization.hpp" #include "irods_exception.hpp" -#include "rodsError.hpp" +#include "rodsErrorTable.h" namespace irods { const char default_escape_char = '\\'; diff --git a/iRODS/lib/core/src/irods_server_properties.cpp b/iRODS/lib/core/src/irods_server_properties.cpp index f18ebcf054..8150b2ead6 100644 --- a/iRODS/lib/core/src/irods_server_properties.cpp +++ b/iRODS/lib/core/src/irods_server_properties.cpp @@ -8,7 +8,7 @@ #include "irods_server_properties.hpp" #include "irods_get_full_path_for_config_file.hpp" -#include "rods.hpp" +#include "rods.h" #include "rodsConnect.h" #include "irods_log.hpp" #include "irods_lookup_table.hpp" diff --git a/iRODS/lib/core/src/irods_stacktrace.cpp b/iRODS/lib/core/src/irods_stacktrace.cpp index f6663cb116..b58190ffeb 100644 --- a/iRODS/lib/core/src/irods_stacktrace.cpp +++ b/iRODS/lib/core/src/irods_stacktrace.cpp @@ -1,5 +1,5 @@ #include "irods_stacktrace.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "irods_log.hpp" #include diff --git a/iRODS/lib/core/src/lsUtil.cpp b/iRODS/lib/core/src/lsUtil.cpp index 3856d5aa53..a322c8e8d2 100644 --- a/iRODS/lib/core/src/lsUtil.cpp +++ b/iRODS/lib/core/src/lsUtil.cpp @@ -1,6 +1,6 @@ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "lsUtil.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/core/src/mcollUtil.cpp b/iRODS/lib/core/src/mcollUtil.cpp index 8907cbfb12..d1c7c7bfcc 100644 --- a/iRODS/lib/core/src/mcollUtil.cpp +++ b/iRODS/lib/core/src/mcollUtil.cpp @@ -1,8 +1,8 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "mcollUtil.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/core/src/miscUtil.cpp b/iRODS/lib/core/src/miscUtil.cpp index 08e84752cc..1052cea38a 100644 --- a/iRODS/lib/core/src/miscUtil.cpp +++ b/iRODS/lib/core/src/miscUtil.cpp @@ -5,8 +5,8 @@ #include #endif #include -#include "rodsClient.hpp" -#include "rodsLog.hpp" +#include "rodsClient.h" +#include "rodsLog.h" #include "miscUtil.hpp" #include "irods_stacktrace.hpp" diff --git a/iRODS/lib/core/src/mkdirUtil.cpp b/iRODS/lib/core/src/mkdirUtil.cpp index a5cfe01018..fd43c44263 100644 --- a/iRODS/lib/core/src/mkdirUtil.cpp +++ b/iRODS/lib/core/src/mkdirUtil.cpp @@ -1,8 +1,8 @@ /*** Copyright (c), The Regents of the University of California *** *** For more infomkdiration please refer to files in the COPYRIGHT directory ***/ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "mkdirUtil.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/core/src/mvUtil.cpp b/iRODS/lib/core/src/mvUtil.cpp index 5d38a66213..0b5f04b3ef 100644 --- a/iRODS/lib/core/src/mvUtil.cpp +++ b/iRODS/lib/core/src/mvUtil.cpp @@ -3,9 +3,9 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "miscUtil.hpp" #include "mvUtil.hpp" diff --git a/iRODS/lib/core/src/obf.cpp b/iRODS/lib/core/src/obf.cpp index 7557d2caad..8cab1a83e8 100644 --- a/iRODS/lib/core/src/obf.cpp +++ b/iRODS/lib/core/src/obf.cpp @@ -46,8 +46,8 @@ #endif #include -#include "rods.hpp" -#include "rodsPath.hpp" +#include "rods.h" +#include "rodsPath.h" #include "authenticate.hpp" #ifdef _WIN32 diff --git a/iRODS/lib/core/src/osauth.cpp b/iRODS/lib/core/src/osauth.cpp index a7fcfc76f4..0a62685883 100644 --- a/iRODS/lib/core/src/osauth.cpp +++ b/iRODS/lib/core/src/osauth.cpp @@ -18,7 +18,8 @@ #include #endif -#include "rods.hpp" +#include "rods.h" +#include "osauth.h" #include "rcGlobalExtern.hpp" #include "authenticate.hpp" extern "C" { diff --git a/iRODS/lib/core/src/packStruct.cpp b/iRODS/lib/core/src/packStruct.cpp index 96a16a3e2f..b430ddd584 100644 --- a/iRODS/lib/core/src/packStruct.cpp +++ b/iRODS/lib/core/src/packStruct.cpp @@ -6,7 +6,7 @@ #include "packStruct.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rcGlobalExtern.hpp" #include "base64.hpp" #include "rcMisc.hpp" diff --git a/iRODS/lib/core/src/parseCommandLine.cpp b/iRODS/lib/core/src/parseCommandLine.cpp index 846227b859..94239b847c 100644 --- a/iRODS/lib/core/src/parseCommandLine.cpp +++ b/iRODS/lib/core/src/parseCommandLine.cpp @@ -13,10 +13,10 @@ If you need additional options, please update this routine and the CommandLineOptions document so we can keep it all consistent. */ -#include "rods.hpp" -#include "parseCommandLine.hpp" -#include "getRodsEnv.hpp" -#include "rodsLog.hpp" +#include "rods.h" +#include "parseCommandLine.h" +#include "getRodsEnv.h" +#include "rodsLog.h" #include "rcMisc.hpp" #ifdef windows_platform #include "irodsntutil.hpp" diff --git a/iRODS/lib/core/src/phybunUtil.cpp b/iRODS/lib/core/src/phybunUtil.cpp index 864a00d87e..9d20a0f5e5 100644 --- a/iRODS/lib/core/src/phybunUtil.cpp +++ b/iRODS/lib/core/src/phybunUtil.cpp @@ -1,8 +1,8 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "phybunUtil.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/core/src/phymvUtil.cpp b/iRODS/lib/core/src/phymvUtil.cpp index 8f1a963be1..da814b400f 100644 --- a/iRODS/lib/core/src/phymvUtil.cpp +++ b/iRODS/lib/core/src/phymvUtil.cpp @@ -3,9 +3,9 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "miscUtil.hpp" #include "phymvUtil.hpp" diff --git a/iRODS/lib/core/src/procApiRequest.cpp b/iRODS/lib/core/src/procApiRequest.cpp index 226af0b634..a6477f662f 100644 --- a/iRODS/lib/core/src/procApiRequest.cpp +++ b/iRODS/lib/core/src/procApiRequest.cpp @@ -10,10 +10,10 @@ // =-=-=-=-=-=-=- // irods includes -#include "procApiRequest.hpp" +#include "procApiRequest.h" #include "rcGlobalExtern.hpp" #include "rcMisc.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include "sockCommNetworkInterface.hpp" // =-=-=-=-=-=-=- diff --git a/iRODS/lib/core/src/putUtil.cpp b/iRODS/lib/core/src/putUtil.cpp index 16ca53b49c..ebc5c5d2a5 100644 --- a/iRODS/lib/core/src/putUtil.cpp +++ b/iRODS/lib/core/src/putUtil.cpp @@ -3,9 +3,9 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "putUtil.hpp" #include "miscUtil.hpp" #include "rcPortalOpr.hpp" @@ -15,7 +15,7 @@ #include "irods_server_properties.hpp" #include "readServerConfig.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include #include diff --git a/iRODS/lib/core/src/rcConnect.cpp b/iRODS/lib/core/src/rcConnect.cpp index 4374e64cbd..290f586a75 100644 --- a/iRODS/lib/core/src/rcConnect.cpp +++ b/iRODS/lib/core/src/rcConnect.cpp @@ -5,7 +5,7 @@ * */ -#include "rcConnect.hpp" +#include "rcConnect.h" #include "rcGlobal.hpp" #ifdef windows_platform @@ -21,10 +21,10 @@ #include "irods_stacktrace.hpp" #include "irods_network_factory.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include "irods_threads.hpp" #include "sockCommNetworkInterface.hpp" -#include "rodsError.hpp" +#include "rodsError.h" rcComm_t * rcConnect( const char *rodsHost, int rodsPort, const char *userName, const char *rodsZone, diff --git a/iRODS/lib/core/src/rcMisc.cpp b/iRODS/lib/core/src/rcMisc.cpp index 8d0094c9b1..b3eb3fbd7e 100644 --- a/iRODS/lib/core/src/rcMisc.cpp +++ b/iRODS/lib/core/src/rcMisc.cpp @@ -14,14 +14,14 @@ #include "modDataObjMeta.hpp" #include "rcGlobalExtern.hpp" #include "rodsGenQueryNames.hpp" -#include "rodsType.hpp" +#include "rodsType.h" #include "rsApiHandler.hpp" #include "dataObjPut.hpp" #include "reFuncDefs.hpp" #include "bulkDataObjPut.hpp" #include "putUtil.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include #include diff --git a/iRODS/lib/core/src/rcPortalOpr.cpp b/iRODS/lib/core/src/rcPortalOpr.cpp index 1acd6e6a0c..3869f9c1be 100644 --- a/iRODS/lib/core/src/rcPortalOpr.cpp +++ b/iRODS/lib/core/src/rcPortalOpr.cpp @@ -7,7 +7,7 @@ #include "dataObjLseek.hpp" #include "fileLseek.hpp" #include "dataObjOpr.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rcGlobalExtern.hpp" // =-=-=-=-=-=-=- diff --git a/iRODS/lib/core/src/regUtil.cpp b/iRODS/lib/core/src/regUtil.cpp index 2c1a9235b6..465b4ca91e 100644 --- a/iRODS/lib/core/src/regUtil.cpp +++ b/iRODS/lib/core/src/regUtil.cpp @@ -1,8 +1,8 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "regUtil.hpp" #include "miscUtil.hpp" #include "checksum.hpp" diff --git a/iRODS/lib/core/src/replUtil.cpp b/iRODS/lib/core/src/replUtil.cpp index 3ff870ad1b..7ba204ab51 100644 --- a/iRODS/lib/core/src/replUtil.cpp +++ b/iRODS/lib/core/src/replUtil.cpp @@ -3,9 +3,9 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "miscUtil.hpp" #include "replUtil.hpp" diff --git a/iRODS/lib/core/src/rmUtil.cpp b/iRODS/lib/core/src/rmUtil.cpp index 92ac27e45d..4c0f9f5a68 100644 --- a/iRODS/lib/core/src/rmUtil.cpp +++ b/iRODS/lib/core/src/rmUtil.cpp @@ -3,10 +3,10 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" #include "miscUtil.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rmUtil.hpp" int diff --git a/iRODS/lib/core/src/rmtrashUtil.cpp b/iRODS/lib/core/src/rmtrashUtil.cpp index 93ad1d35c2..925c927c4d 100644 --- a/iRODS/lib/core/src/rmtrashUtil.cpp +++ b/iRODS/lib/core/src/rmtrashUtil.cpp @@ -3,10 +3,10 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" #include "miscUtil.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rmtrashUtil.hpp" int diff --git a/iRODS/lib/core/src/rodsLog.cpp.src b/iRODS/lib/core/src/rodsLog.cpp.src index 1f7f53a658..6184c44870 100644 --- a/iRODS/lib/core/src/rodsLog.cpp.src +++ b/iRODS/lib/core/src/rodsLog.cpp.src @@ -1,7 +1,7 @@ /*** Copyright (c), The Regents of the University of California *** *** For more information please refer to files in the COPYRIGHT directory ***/ -#include "rods.hpp" +#include "rods.h" #ifdef SYSLOG #ifndef windows_platform @@ -9,7 +9,8 @@ #endif #endif -#include "rodsLog.hpp" +#include "rodsLog.h" +#include "rodsErrorTable.h" #include "rcGlobalExtern.hpp" #include "rcMisc.hpp" #include diff --git a/iRODS/lib/core/src/rodsPath.cpp b/iRODS/lib/core/src/rodsPath.cpp index 8e9afe28a7..4983607857 100644 --- a/iRODS/lib/core/src/rodsPath.cpp +++ b/iRODS/lib/core/src/rodsPath.cpp @@ -4,11 +4,11 @@ * copying. */ -#include "rodsPath.hpp" +#include "rodsPath.h" #include "miscUtil.hpp" #include "rcMisc.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsErrorTable.h" +#include "rodsLog.h" #ifdef windows_platform #include "irodsntutil.hpp" #endif diff --git a/iRODS/lib/core/src/rsyncUtil.cpp b/iRODS/lib/core/src/rsyncUtil.cpp index 50512a1d13..b1054575ab 100644 --- a/iRODS/lib/core/src/rsyncUtil.cpp +++ b/iRODS/lib/core/src/rsyncUtil.cpp @@ -3,9 +3,9 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "rsyncUtil.hpp" #include "miscUtil.hpp" #include "checksum.hpp" diff --git a/iRODS/lib/core/src/scanUtil.cpp b/iRODS/lib/core/src/scanUtil.cpp index cec318a863..1e21237ae1 100644 --- a/iRODS/lib/core/src/scanUtil.cpp +++ b/iRODS/lib/core/src/scanUtil.cpp @@ -2,9 +2,9 @@ *** For full copyright notice please refer to files in the COPYRIGHT directory ***/ /* Written by Jean-Yves Nief of CCIN2P3 and copyright assigned to Data Intensive Cyberinfrastructure Foundation */ -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "scanUtil.hpp" #include "miscUtil.hpp" diff --git a/iRODS/lib/core/src/sockComm.cpp b/iRODS/lib/core/src/sockComm.cpp index 6debf30358..dd0336860d 100644 --- a/iRODS/lib/core/src/sockComm.cpp +++ b/iRODS/lib/core/src/sockComm.cpp @@ -3,14 +3,14 @@ /* sockComm.c - sock communication routines */ -#include "sockComm.hpp" +#include "sockComm.h" #include "rcMisc.hpp" #include "rcGlobalExtern.hpp" #include "miscServerFunct.hpp" #include "getHostForPut.hpp" #include "getHostForGet.hpp" #include "QUANTAnet_rbudpBase_c.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "rodsConnect.h" #ifdef windows_platform diff --git a/iRODS/lib/core/src/sslSockComm.cpp b/iRODS/lib/core/src/sslSockComm.cpp index d678f2705f..51ecfcbe14 100644 --- a/iRODS/lib/core/src/sslSockComm.cpp +++ b/iRODS/lib/core/src/sslSockComm.cpp @@ -4,8 +4,8 @@ */ -#include "rodsClient.hpp" -#include "sslSockComm.hpp" +#include "rodsClient.h" +#include "sslSockComm.h" #include "irods_client_server_negotiation.hpp" // =-=-=-=-=-=-=- diff --git a/iRODS/lib/core/src/stringOpr.cpp b/iRODS/lib/core/src/stringOpr.cpp index b876736259..c27cbbefca 100644 --- a/iRODS/lib/core/src/stringOpr.cpp +++ b/iRODS/lib/core/src/stringOpr.cpp @@ -4,9 +4,9 @@ * copying. */ -#include "stringOpr.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "stringOpr.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include #include "boost/regex.hpp" diff --git a/iRODS/lib/core/src/trimUtil.cpp b/iRODS/lib/core/src/trimUtil.cpp index 204029724d..72039c985a 100644 --- a/iRODS/lib/core/src/trimUtil.cpp +++ b/iRODS/lib/core/src/trimUtil.cpp @@ -3,9 +3,9 @@ #ifndef windows_platform #include #endif -#include "rodsPath.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsPath.h" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include "miscUtil.hpp" #include "trimUtil.hpp" diff --git a/iRODS/lib/fortran/src/fortran_io.cpp b/iRODS/lib/fortran/src/fortran_io.cpp index 7a1b5b171e..7cb484b3da 100644 --- a/iRODS/lib/fortran/src/fortran_io.cpp +++ b/iRODS/lib/fortran/src/fortran_io.cpp @@ -14,7 +14,7 @@ */ #include -#include "rodsClient.hpp" +#include "rodsClient.h" #include "dataObjRead.hpp" int debug = 0; diff --git a/iRODS/lib/hasher/include/checksum.hpp b/iRODS/lib/hasher/include/checksum.hpp index f2e9f47bf6..12f930eb81 100644 --- a/iRODS/lib/hasher/include/checksum.hpp +++ b/iRODS/lib/hasher/include/checksum.hpp @@ -8,7 +8,7 @@ #include #include #include -#include "objInfo.hpp" +#include "objInfo.h" #ifdef __cplusplus extern "C" { diff --git a/iRODS/lib/hasher/src/Hasher.cpp b/iRODS/lib/hasher/src/Hasher.cpp index 31785b9cc0..4242447779 100644 --- a/iRODS/lib/hasher/src/Hasher.cpp +++ b/iRODS/lib/hasher/src/Hasher.cpp @@ -1,9 +1,10 @@ #include "Hasher.hpp" + #include #include #include -#include +#include "rodsErrorTable.h" #include "irods_stacktrace.hpp" namespace irods { diff --git a/iRODS/lib/hasher/src/checksum.cpp b/iRODS/lib/hasher/src/checksum.cpp index c3bd694020..2540c38876 100644 --- a/iRODS/lib/hasher/src/checksum.cpp +++ b/iRODS/lib/hasher/src/checksum.cpp @@ -3,11 +3,11 @@ #include "irods_stacktrace.hpp" #include "irods_hasher_factory.hpp" -#include "getRodsEnv.hpp" +#include "getRodsEnv.h" #include "irods_log.hpp" -#include "objInfo.hpp" +#include "objInfo.h" #include "MD5Strategy.hpp" -#include "rodsKeyWdDef.hpp" +#include "rodsKeyWdDef.h" #include "rcMisc.hpp" #include "checksum.hpp" diff --git a/iRODS/lib/hasher/src/irods_hasher_factory.cpp b/iRODS/lib/hasher/src/irods_hasher_factory.cpp index 8c0862a439..4bec0b3399 100644 --- a/iRODS/lib/hasher/src/irods_hasher_factory.cpp +++ b/iRODS/lib/hasher/src/irods_hasher_factory.cpp @@ -2,7 +2,7 @@ #include "checksum.hpp" #include "MD5Strategy.hpp" #include "SHA256Strategy.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include #include diff --git a/iRODS/lib/isio/src/isio.cpp b/iRODS/lib/isio/src/isio.cpp index c4c7976df1..38847759fa 100644 --- a/iRODS/lib/isio/src/isio.cpp +++ b/iRODS/lib/isio/src/isio.cpp @@ -26,7 +26,7 @@ */ #include -#include "rodsClient.hpp" +#include "rodsClient.h" #include "dataObjRead.hpp" #define PREFIX "irods:" diff --git a/iRODS/lib/rbudp/src/QUANTAnet_rbudpBase_c.cpp b/iRODS/lib/rbudp/src/QUANTAnet_rbudpBase_c.cpp index a931353845..73fe3d0d76 100644 --- a/iRODS/lib/rbudp/src/QUANTAnet_rbudpBase_c.cpp +++ b/iRODS/lib/rbudp/src/QUANTAnet_rbudpBase_c.cpp @@ -21,7 +21,7 @@ *****************************************************************************/ #include "QUANTAnet_rbudpBase_c.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include // inline void TRACE_DEBUG( char *format, ...) diff --git a/iRODS/lib/rbudp/src/QUANTAnet_rbudpSender_c.cpp b/iRODS/lib/rbudp/src/QUANTAnet_rbudpSender_c.cpp index b00764ed39..ae1290a77f 100644 --- a/iRODS/lib/rbudp/src/QUANTAnet_rbudpSender_c.cpp +++ b/iRODS/lib/rbudp/src/QUANTAnet_rbudpSender_c.cpp @@ -21,8 +21,8 @@ *****************************************************************************/ #include "QUANTAnet_rbudpSender_c.hpp" -#include "rodsErrorTable.hpp" -#include "rodsLog.hpp" +#include "rodsErrorTable.h" +#include "rodsLog.h" #include #include diff --git a/iRODS/lib/test/src/l1rm.cpp b/iRODS/lib/test/src/l1rm.cpp index d77f6f19fc..fa261b4c94 100644 --- a/iRODS/lib/test/src/l1rm.cpp +++ b/iRODS/lib/test/src/l1rm.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* l1rm.c - test the high level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" #define USER_NAME "rods" #define RODS_ZONE "temp" diff --git a/iRODS/lib/test/src/l1test.cpp b/iRODS/lib/test/src/l1test.cpp index fea4a16f25..49806db330 100644 --- a/iRODS/lib/test/src/l1test.cpp +++ b/iRODS/lib/test/src/l1test.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* l1test.c - test the high level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" #define USER_NAME "rods" #define RODS_ZONE "tempZone" diff --git a/iRODS/lib/test/src/l3structFile.cpp b/iRODS/lib/test/src/l3structFile.cpp index 5e0cba0f0c..9c43b12b82 100644 --- a/iRODS/lib/test/src/l3structFile.cpp +++ b/iRODS/lib/test/src/l3structFile.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* l3bundle.c - test the low level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" #define BUFSIZE (1024*1024) diff --git a/iRODS/lib/test/src/listcoll.cpp b/iRODS/lib/test/src/listcoll.cpp index 58086bf4b3..ddc65450d7 100644 --- a/iRODS/lib/test/src/listcoll.cpp +++ b/iRODS/lib/test/src/listcoll.cpp @@ -5,7 +5,7 @@ * 1) */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "miscUtil.hpp" int diff --git a/iRODS/lib/test/src/lowlevtest.cpp b/iRODS/lib/test/src/lowlevtest.cpp index acd8e40f1d..40c1797e0a 100644 --- a/iRODS/lib/test/src/lowlevtest.cpp +++ b/iRODS/lib/test/src/lowlevtest.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* lowlevtest.cpp - test the low level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" /* NOTE : You have to change FILE_NAME, PAR_DIR_NAME, DIR_NAME and ADDR * for your own env */ diff --git a/iRODS/lib/test/src/luketest.cpp b/iRODS/lib/test/src/luketest.cpp index 678f1ee1c6..a1cf503a47 100644 --- a/iRODS/lib/test/src/luketest.cpp +++ b/iRODS/lib/test/src/luketest.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* l1test.c - test the high level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" #define USER_NAME "rods" #define RODS_ZONE "tempZone" diff --git a/iRODS/lib/test/src/packtest.cpp b/iRODS/lib/test/src/packtest.cpp index 85dd3d543c..38862c1cc2 100644 --- a/iRODS/lib/test/src/packtest.cpp +++ b/iRODS/lib/test/src/packtest.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* packtest.c - test the basic packing routines */ -#include "rodsClient.hpp" +#include "rodsClient.h" struct myTest { char c1[17]; char c2[18]; diff --git a/iRODS/lib/test/src/phptest.cpp b/iRODS/lib/test/src/phptest.cpp index 9bba432b5c..24986b6067 100644 --- a/iRODS/lib/test/src/phptest.cpp +++ b/iRODS/lib/test/src/phptest.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* phpTest.c - test the high level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include #include #include diff --git a/iRODS/lib/test/src/testrule.cpp b/iRODS/lib/test/src/testrule.cpp index 12443fb36a..3d536e975b 100644 --- a/iRODS/lib/test/src/testrule.cpp +++ b/iRODS/lib/test/src/testrule.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* l1rm.c - test the high level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" #define USER_NAME "rods" #define RODS_ZONE "temp" diff --git a/iRODS/lib/test/src/xmltest.cpp b/iRODS/lib/test/src/xmltest.cpp index c8658000b9..6d47ab20c6 100644 --- a/iRODS/lib/test/src/xmltest.cpp +++ b/iRODS/lib/test/src/xmltest.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* packtest.c - test the basic packing routines */ -#include "rodsClient.hpp" +#include "rodsClient.h" struct myTest { char c1[17]; char c2[18]; diff --git a/iRODS/lib/test/src/xmsgtest.cpp b/iRODS/lib/test/src/xmsgtest.cpp index 04f18bf34d..497b4b5786 100644 --- a/iRODS/lib/test/src/xmsgtest.cpp +++ b/iRODS/lib/test/src/xmsgtest.cpp @@ -2,7 +2,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ /* xmsgTest.c - test the high level api */ -#include "rodsClient.hpp" +#include "rodsClient.h" int main( int argc, char **argv ) { diff --git a/iRODS/scripts/perl/updateRodsLog.pl b/iRODS/scripts/perl/updateRodsLog.pl index 833446d45d..cb71cb5f2e 100644 --- a/iRODS/scripts/perl/updateRodsLog.pl +++ b/iRODS/scripts/perl/updateRodsLog.pl @@ -4,10 +4,10 @@ # For more information please refer to files in the COPYRIGHT directory *** # # This perl script replaces some tables in rodsLog.cpp after the -# rodsErrorTable.hpp file is updated. It is run by gmake. +# rodsErrorTable.h file is updated. It is run by gmake. # -$Defs=`grep '#define' ../lib/core/include/rodsErrorTable.hpp | grep -v RODS_ERROR_TABLE_H | grep -v '* #' | awk '{ printf("%s ", \$2) }'`; +$Defs=`grep '#define' ../lib/core/include/rodsErrorTable.h | grep -v RODS_ERROR_TABLE_H | grep -v '* #' | awk '{ printf("%s ", \$2) }'`; $_=$Defs; @DO_LIST=split(" ",$_); diff --git a/iRODS/server/api/src/rsClientHints.cpp b/iRODS/server/api/src/rsClientHints.cpp index ab78c11034..477464213e 100644 --- a/iRODS/server/api/src/rsClientHints.cpp +++ b/iRODS/server/api/src/rsClientHints.cpp @@ -1,5 +1,5 @@ #include "rsGlobalExtern.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "irods_lookup_table.hpp" #include "irods_server_properties.hpp" diff --git a/iRODS/server/api/src/rsCollCreate.cpp b/iRODS/server/api/src/rsCollCreate.cpp index 6273c0e23e..da702743b3 100644 --- a/iRODS/server/api/src/rsCollCreate.cpp +++ b/iRODS/server/api/src/rsCollCreate.cpp @@ -6,7 +6,7 @@ #include "reFuncDefs.hpp" #include "collCreate.hpp" #include "rodsConnect.h" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "regColl.hpp" #include "icatDefines.hpp" #include "fileMkdir.hpp" diff --git a/iRODS/server/api/src/rsCollRepl.cpp b/iRODS/server/api/src/rsCollRepl.cpp index 9c80ace271..7b7834cd67 100644 --- a/iRODS/server/api/src/rsCollRepl.cpp +++ b/iRODS/server/api/src/rsCollRepl.cpp @@ -5,7 +5,7 @@ #include "collRepl.hpp" #include "dataObjOpr.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "reGlobalsExtern.hpp" #include "reDefines.hpp" diff --git a/iRODS/server/api/src/rsDataObjClose.cpp b/iRODS/server/api/src/rsDataObjClose.cpp index 04ef6bd352..8611021880 100644 --- a/iRODS/server/api/src/rsDataObjClose.cpp +++ b/iRODS/server/api/src/rsDataObjClose.cpp @@ -5,7 +5,7 @@ #include "dataObjClose.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "reFuncDefs.hpp" #include "regReplica.hpp" #include "modDataObjMeta.hpp" diff --git a/iRODS/server/api/src/rsDataObjCopy.cpp b/iRODS/server/api/src/rsDataObjCopy.cpp index 87e3fdd623..b19b2367c2 100644 --- a/iRODS/server/api/src/rsDataObjCopy.cpp +++ b/iRODS/server/api/src/rsDataObjCopy.cpp @@ -4,7 +4,7 @@ /* See dataObjCopy.h for a description of this API call.*/ #include "dataObjCopy.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "collection.hpp" #include "specColl.hpp" diff --git a/iRODS/server/api/src/rsDataObjCreate.cpp b/iRODS/server/api/src/rsDataObjCreate.cpp index 0d6c01ffe9..112d26167f 100644 --- a/iRODS/server/api/src/rsDataObjCreate.cpp +++ b/iRODS/server/api/src/rsDataObjCreate.cpp @@ -8,7 +8,7 @@ #include "dataObjOpen.hpp" #include "fileCreate.hpp" #include "subStructFileCreate.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "resource.hpp" #include "specColl.hpp" diff --git a/iRODS/server/api/src/rsDataObjCreateAndStat.cpp b/iRODS/server/api/src/rsDataObjCreateAndStat.cpp index c10fe37a27..62007d0368 100644 --- a/iRODS/server/api/src/rsDataObjCreateAndStat.cpp +++ b/iRODS/server/api/src/rsDataObjCreateAndStat.cpp @@ -5,7 +5,7 @@ #include "dataObjCreate.hpp" #include "dataObjCreateAndStat.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" #include "reGlobalsExtern.hpp" diff --git a/iRODS/server/api/src/rsDataObjGet.cpp b/iRODS/server/api/src/rsDataObjGet.cpp index 5e416fed64..3399e2f26e 100644 --- a/iRODS/server/api/src/rsDataObjGet.cpp +++ b/iRODS/server/api/src/rsDataObjGet.cpp @@ -5,7 +5,7 @@ #include "reFuncDefs.hpp" #include "dataObjGet.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "dataGet.hpp" #include "fileGet.hpp" #include "dataObjOpen.hpp" diff --git a/iRODS/server/api/src/rsDataObjLock.cpp b/iRODS/server/api/src/rsDataObjLock.cpp index 581bd50e94..820cdad023 100644 --- a/iRODS/server/api/src/rsDataObjLock.cpp +++ b/iRODS/server/api/src/rsDataObjLock.cpp @@ -4,7 +4,7 @@ /* See dataObjLock.h for a description of this API call.*/ #include "dataObjLock.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "dataObjOpr.hpp" #include "physPath.hpp" diff --git a/iRODS/server/api/src/rsDataObjLseek.cpp b/iRODS/server/api/src/rsDataObjLseek.cpp index 37dddf34cd..c844996517 100644 --- a/iRODS/server/api/src/rsDataObjLseek.cpp +++ b/iRODS/server/api/src/rsDataObjLseek.cpp @@ -4,7 +4,7 @@ /* See dataObjLseek.h for a description of this API call.*/ #include "dataObjLseek.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" #include "subStructFileLseek.hpp" diff --git a/iRODS/server/api/src/rsDataObjOpen.cpp b/iRODS/server/api/src/rsDataObjOpen.cpp index 39297023d1..0cb3d006fc 100644 --- a/iRODS/server/api/src/rsDataObjOpen.cpp +++ b/iRODS/server/api/src/rsDataObjOpen.cpp @@ -5,7 +5,7 @@ #include "dataObjOpen.hpp" #include "dataObjOpenAndStat.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "resource.hpp" #include "resource.hpp" diff --git a/iRODS/server/api/src/rsDataObjOpenAndStat.cpp b/iRODS/server/api/src/rsDataObjOpenAndStat.cpp index ebb7d16327..020a65e0ba 100644 --- a/iRODS/server/api/src/rsDataObjOpenAndStat.cpp +++ b/iRODS/server/api/src/rsDataObjOpenAndStat.cpp @@ -5,7 +5,7 @@ #include "dataObjOpen.hpp" #include "dataObjOpenAndStat.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" #include "reGlobalsExtern.hpp" diff --git a/iRODS/server/api/src/rsDataObjPhymv.cpp b/iRODS/server/api/src/rsDataObjPhymv.cpp index 08bab776b4..7efe78f49b 100644 --- a/iRODS/server/api/src/rsDataObjPhymv.cpp +++ b/iRODS/server/api/src/rsDataObjPhymv.cpp @@ -5,7 +5,7 @@ #include "reFuncDefs.hpp" #include "dataObjRepl.hpp" #include "dataObjOpr.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "specColl.hpp" #include "reGlobalsExtern.hpp" diff --git a/iRODS/server/api/src/rsDataObjPut.cpp b/iRODS/server/api/src/rsDataObjPut.cpp index d321097271..435860c67f 100644 --- a/iRODS/server/api/src/rsDataObjPut.cpp +++ b/iRODS/server/api/src/rsDataObjPut.cpp @@ -4,7 +4,7 @@ /* See dataObjPut.hpp for a description of this API call.*/ #include "dataObjPut.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "dataPut.hpp" #include "reFuncDefs.hpp" #include "filePut.hpp" diff --git a/iRODS/server/api/src/rsDataObjRead.cpp b/iRODS/server/api/src/rsDataObjRead.cpp index 6d3d554352..34557e60c1 100644 --- a/iRODS/server/api/src/rsDataObjRead.cpp +++ b/iRODS/server/api/src/rsDataObjRead.cpp @@ -4,7 +4,7 @@ /* See dataObjRead.h for a description of this API call.*/ #include "dataObjRead.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/iRODS/server/api/src/rsDataObjRepl.cpp b/iRODS/server/api/src/rsDataObjRepl.cpp index 49d30c765a..11fd459953 100644 --- a/iRODS/server/api/src/rsDataObjRepl.cpp +++ b/iRODS/server/api/src/rsDataObjRepl.cpp @@ -10,7 +10,7 @@ #include "dataObjOpen.hpp" #include "dataObjPut.hpp" #include "dataObjGet.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "physPath.hpp" #include "specColl.hpp" diff --git a/iRODS/server/api/src/rsDataObjTrim.cpp b/iRODS/server/api/src/rsDataObjTrim.cpp index 3b18bfb6b3..6ed2f1818e 100644 --- a/iRODS/server/api/src/rsDataObjTrim.cpp +++ b/iRODS/server/api/src/rsDataObjTrim.cpp @@ -5,7 +5,7 @@ #include "dataObjTrim.hpp" #include "dataObjUnlink.hpp" #include "dataObjOpr.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "specColl.hpp" #include "reGlobalsExtern.hpp" diff --git a/iRODS/server/api/src/rsDataObjTruncate.cpp b/iRODS/server/api/src/rsDataObjTruncate.cpp index 83481c39cf..ca66790574 100644 --- a/iRODS/server/api/src/rsDataObjTruncate.cpp +++ b/iRODS/server/api/src/rsDataObjTruncate.cpp @@ -4,7 +4,7 @@ /* See dataObjTruncate.h for a description of this API call.*/ #include "dataObjTruncate.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "icatDefines.hpp" #include "fileTruncate.hpp" #include "unregDataObj.hpp" diff --git a/iRODS/server/api/src/rsDataObjUnlink.cpp b/iRODS/server/api/src/rsDataObjUnlink.cpp index 2e6826e2fc..6e6631d689 100644 --- a/iRODS/server/api/src/rsDataObjUnlink.cpp +++ b/iRODS/server/api/src/rsDataObjUnlink.cpp @@ -4,7 +4,7 @@ /* See dataObjUnlink.h for a description of this API call.*/ #include "dataObjUnlink.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rodsConnect.h" #include "icatDefines.hpp" #include "fileUnlink.hpp" diff --git a/iRODS/server/api/src/rsDataObjWrite.cpp b/iRODS/server/api/src/rsDataObjWrite.cpp index 009f39f54f..cff82c54e9 100644 --- a/iRODS/server/api/src/rsDataObjWrite.cpp +++ b/iRODS/server/api/src/rsDataObjWrite.cpp @@ -4,7 +4,7 @@ /* See dataObjWrite.h for a description of this API call.*/ #include "dataObjWrite.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "subStructFileWrite.hpp" #include "rsGlobalExtern.hpp" diff --git a/iRODS/server/api/src/rsDataPut.cpp b/iRODS/server/api/src/rsDataPut.cpp index 059d49a2a2..0198830dbc 100644 --- a/iRODS/server/api/src/rsDataPut.cpp +++ b/iRODS/server/api/src/rsDataPut.cpp @@ -4,7 +4,7 @@ /* See dataPut.h for a description of this API call.*/ #include "dataPut.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "miscServerFunct.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/iRODS/server/api/src/rsExecCmd.cpp b/iRODS/server/api/src/rsExecCmd.cpp index 5d41e3bcc8..5766373df4 100644 --- a/iRODS/server/api/src/rsExecCmd.cpp +++ b/iRODS/server/api/src/rsExecCmd.cpp @@ -13,7 +13,7 @@ #include "objMetaOpr.hpp" #include "dataObjOpr.hpp" #include "miscServerFunct.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/iRODS/server/api/src/rsGetHostForGet.cpp b/iRODS/server/api/src/rsGetHostForGet.cpp index 8e149b0d40..b776ad2345 100644 --- a/iRODS/server/api/src/rsGetHostForGet.cpp +++ b/iRODS/server/api/src/rsGetHostForGet.cpp @@ -5,7 +5,7 @@ #include "getHostForGet.hpp" #include "getHostForPut.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" #include "getRemoteZoneResc.hpp" diff --git a/iRODS/server/api/src/rsGetHostForPut.cpp b/iRODS/server/api/src/rsGetHostForPut.cpp index 6102b1791c..ffd2f26de7 100644 --- a/iRODS/server/api/src/rsGetHostForPut.cpp +++ b/iRODS/server/api/src/rsGetHostForPut.cpp @@ -4,7 +4,7 @@ /* See getHostForPut.h for a description of this API call.*/ #include "getHostForPut.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" #include "getRemoteZoneResc.hpp" diff --git a/iRODS/server/api/src/rsGetRemoteZoneResc.cpp b/iRODS/server/api/src/rsGetRemoteZoneResc.cpp index bbb965a1fe..2a35ac2fd6 100644 --- a/iRODS/server/api/src/rsGetRemoteZoneResc.cpp +++ b/iRODS/server/api/src/rsGetRemoteZoneResc.cpp @@ -4,7 +4,7 @@ */ #include "getRemoteZoneResc.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "objMetaOpr.hpp" #include "dataObjOpr.hpp" #include "physPath.hpp" diff --git a/iRODS/server/api/src/rsIESClientHints.cpp b/iRODS/server/api/src/rsIESClientHints.cpp index ee59db78ed..fe886d5dcc 100644 --- a/iRODS/server/api/src/rsIESClientHints.cpp +++ b/iRODS/server/api/src/rsIESClientHints.cpp @@ -1,6 +1,6 @@ #include "rsGlobalExtern.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "miscServerFunct.hpp" #include "specificQuery.hpp" diff --git a/iRODS/server/api/src/rsL3FileGetSingleBuf.cpp b/iRODS/server/api/src/rsL3FileGetSingleBuf.cpp index bfa5663536..83a8af488e 100644 --- a/iRODS/server/api/src/rsL3FileGetSingleBuf.cpp +++ b/iRODS/server/api/src/rsL3FileGetSingleBuf.cpp @@ -4,7 +4,7 @@ /* See l3FileGetSingleBuf.h for a description of this API call.*/ #include "l3FileGetSingleBuf.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "dataGet.hpp" #include "fileGet.hpp" #include "dataObjOpen.hpp" diff --git a/iRODS/server/api/src/rsL3FilePutSingleBuf.cpp b/iRODS/server/api/src/rsL3FilePutSingleBuf.cpp index fdfa13d9cb..4f780e1051 100644 --- a/iRODS/server/api/src/rsL3FilePutSingleBuf.cpp +++ b/iRODS/server/api/src/rsL3FilePutSingleBuf.cpp @@ -4,7 +4,7 @@ /* See l3FilePutSingleBuf.h for a description of this API call.*/ #include "l3FilePutSingleBuf.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "dataPut.hpp" #include "filePut.hpp" #include "dataObjOpen.hpp" diff --git a/iRODS/server/api/src/rsObjStat.cpp b/iRODS/server/api/src/rsObjStat.cpp index 352da277e5..92253211de 100644 --- a/iRODS/server/api/src/rsObjStat.cpp +++ b/iRODS/server/api/src/rsObjStat.cpp @@ -3,7 +3,7 @@ /* rsObjStat.c */ -#include "objStat.hpp" +#include "objStat.h" #include "rcMisc.hpp" #include "genQuery.hpp" #include "querySpecColl.hpp" diff --git a/iRODS/server/api/src/rsPamAuthRequest.cpp b/iRODS/server/api/src/rsPamAuthRequest.cpp index b7b3f13aa1..d20e33349b 100644 --- a/iRODS/server/api/src/rsPamAuthRequest.cpp +++ b/iRODS/server/api/src/rsPamAuthRequest.cpp @@ -13,6 +13,7 @@ #include "irods_server_properties.hpp" #include "readServerConfig.hpp" #include "irods_log.hpp" +#include "sslSockComm.h" int diff --git a/iRODS/server/api/src/rsPhyPathReg.cpp b/iRODS/server/api/src/rsPhyPathReg.cpp index 2ffac5d607..eaf624e256 100644 --- a/iRODS/server/api/src/rsPhyPathReg.cpp +++ b/iRODS/server/api/src/rsPhyPathReg.cpp @@ -6,7 +6,7 @@ #include "reFuncDefs.hpp" #include "fileStat.hpp" #include "phyPathReg.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "icatDefines.hpp" #include "objMetaOpr.hpp" #include "dataObjOpr.hpp" diff --git a/iRODS/server/api/src/rsProcStat.cpp b/iRODS/server/api/src/rsProcStat.cpp index 17de1e9c73..9a21a2f13f 100644 --- a/iRODS/server/api/src/rsProcStat.cpp +++ b/iRODS/server/api/src/rsProcStat.cpp @@ -9,7 +9,7 @@ #include "objMetaOpr.hpp" #include "resource.hpp" #include "miscServerFunct.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" #include "procLog.h" diff --git a/iRODS/server/api/src/rsServerReport.cpp b/iRODS/server/api/src/rsServerReport.cpp index 8934227c34..e3b048470b 100644 --- a/iRODS/server/api/src/rsServerReport.cpp +++ b/iRODS/server/api/src/rsServerReport.cpp @@ -1,5 +1,5 @@ #include "rsGlobalExtern.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "miscServerFunct.hpp" #include "reIn2p3SysRule.hpp" diff --git a/iRODS/server/api/src/rsStructFileExtAndReg.cpp b/iRODS/server/api/src/rsStructFileExtAndReg.cpp index b183217887..2bfa787acf 100644 --- a/iRODS/server/api/src/rsStructFileExtAndReg.cpp +++ b/iRODS/server/api/src/rsStructFileExtAndReg.cpp @@ -11,7 +11,7 @@ #include "resource.hpp" #include "specColl.hpp" #include "physPath.hpp" -#include "objStat.hpp" +#include "objStat.h" #include "miscServerFunct.hpp" #include "fileOpr.hpp" #include "rcGlobalExtern.hpp" diff --git a/iRODS/server/api/src/rsSyncMountedColl.cpp b/iRODS/server/api/src/rsSyncMountedColl.cpp index b24814b3c0..4004a14813 100644 --- a/iRODS/server/api/src/rsSyncMountedColl.cpp +++ b/iRODS/server/api/src/rsSyncMountedColl.cpp @@ -4,7 +4,7 @@ /* See syncMountedColl.h for a description of this API call.*/ #include "syncMountedColl.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "icatDefines.hpp" #include "objMetaOpr.hpp" #include "collection.hpp" diff --git a/iRODS/server/api/src/rsZoneReport.cpp b/iRODS/server/api/src/rsZoneReport.cpp index 488c020b98..540f452f51 100644 --- a/iRODS/server/api/src/rsZoneReport.cpp +++ b/iRODS/server/api/src/rsZoneReport.cpp @@ -1,5 +1,5 @@ #include "rsGlobalExtern.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "miscServerFunct.hpp" #include "irods_log.hpp" diff --git a/iRODS/server/core/include/collection.hpp b/iRODS/server/core/include/collection.hpp index d39b0a7a2f..f17f71317b 100644 --- a/iRODS/server/core/include/collection.hpp +++ b/iRODS/server/core/include/collection.hpp @@ -9,9 +9,9 @@ #ifndef COLLECTION_HPP #define COLLECTION_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "ruleExecSubmit.hpp" #include "rcGlobalExtern.hpp" #include "rsGlobalExtern.hpp" diff --git a/iRODS/server/core/include/dataObjOpr.hpp b/iRODS/server/core/include/dataObjOpr.hpp index cf082989e0..cd492f7fbd 100644 --- a/iRODS/server/core/include/dataObjOpr.hpp +++ b/iRODS/server/core/include/dataObjOpr.hpp @@ -9,9 +9,9 @@ #ifndef DATA_OBJ_OPR_HPP #define DATA_OBJ_OPR_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "ruleExecSubmit.hpp" #include "rcGlobalExtern.hpp" #include "rsGlobalExtern.hpp" diff --git a/iRODS/server/core/include/irodsReServer.hpp b/iRODS/server/core/include/irodsReServer.hpp index 12f67030c0..eaa320681c 100644 --- a/iRODS/server/core/include/irodsReServer.hpp +++ b/iRODS/server/core/include/irodsReServer.hpp @@ -9,13 +9,13 @@ #ifndef RE_SERVER_HPP #define RE_SERVER_HPP -#include "rods.hpp" +#include "rods.h" #include "rcGlobalExtern.hpp" /* client global */ #include "rsLog.hpp" -#include "rodsLog.hpp" -#include "sockComm.hpp" -#include "getRodsEnv.hpp" -#include "rcConnect.hpp" +#include "rodsLog.h" +#include "sockComm.h" +#include "getRodsEnv.h" +#include "rcConnect.h" #define RE_SERVER_SLEEP_TIME 30 #define RE_SERVER_EXEC_TIME 120 diff --git a/iRODS/server/core/include/irodsXmsgServer.hpp b/iRODS/server/core/include/irodsXmsgServer.hpp index 89f26814e3..eb9b1fb34a 100644 --- a/iRODS/server/core/include/irodsXmsgServer.hpp +++ b/iRODS/server/core/include/irodsXmsgServer.hpp @@ -9,14 +9,14 @@ #ifndef XMSG_SERVER_HPP #define XMSG_SERVER_HPP -#include "rods.hpp" +#include "rods.h" #include "rsGlobalExtern.hpp" /* server global */ #include "rcGlobalExtern.hpp" /* client global */ #include "rsLog.hpp" -#include "rodsLog.hpp" -#include "sockComm.hpp" -#include "getRodsEnv.hpp" -#include "rcConnect.hpp" +#include "rodsLog.h" +#include "sockComm.h" +#include "getRodsEnv.h" +#include "rcConnect.h" #define v_FLAG 0x1 diff --git a/iRODS/server/core/include/irods_data_object.hpp b/iRODS/server/core/include/irods_data_object.hpp index 5e2e5255e1..6528033423 100644 --- a/iRODS/server/core/include/irods_data_object.hpp +++ b/iRODS/server/core/include/irods_data_object.hpp @@ -6,7 +6,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" #include "rcMisc.hpp" diff --git a/iRODS/server/core/include/irods_database_object.hpp b/iRODS/server/core/include/irods_database_object.hpp index 37444ebf6d..eb1d99bb65 100644 --- a/iRODS/server/core/include/irods_database_object.hpp +++ b/iRODS/server/core/include/irods_database_object.hpp @@ -7,7 +7,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- // boost includes diff --git a/iRODS/server/core/include/irods_database_types.hpp b/iRODS/server/core/include/irods_database_types.hpp index 8a75fc8337..234711bd83 100644 --- a/iRODS/server/core/include/irods_database_types.hpp +++ b/iRODS/server/core/include/irods_database_types.hpp @@ -13,7 +13,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" namespace irods { // =-=-=-=-=-=-=- diff --git a/iRODS/server/core/include/irods_resource_manager.hpp b/iRODS/server/core/include/irods_resource_manager.hpp index ecff395679..13c697dbd4 100644 --- a/iRODS/server/core/include/irods_resource_manager.hpp +++ b/iRODS/server/core/include/irods_resource_manager.hpp @@ -2,7 +2,7 @@ #define __IRODS_RESOURCE_MANAGER_HPP__ // =-=-=-=-=-=-=- -#include "rods.hpp" +#include "rods.h" #include "irods_resource_plugin.hpp" #include "irods_first_class_object.hpp" diff --git a/iRODS/server/core/include/irods_server_api_call.hpp b/iRODS/server/core/include/irods_server_api_call.hpp index 132f618483..2ebb5f7622 100644 --- a/iRODS/server/core/include/irods_server_api_call.hpp +++ b/iRODS/server/core/include/irods_server_api_call.hpp @@ -1,7 +1,7 @@ #ifndef IRODS_SERVER_API_CALL_HPP__ #define IRODS_SERVER_API_CALL_HPP__ #include "irods_server_api_table.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "rodsDef.h" diff --git a/iRODS/server/core/include/miscServerFunct.hpp b/iRODS/server/core/include/miscServerFunct.hpp index 695715876f..3bbf401126 100644 --- a/iRODS/server/core/include/miscServerFunct.hpp +++ b/iRODS/server/core/include/miscServerFunct.hpp @@ -17,10 +17,10 @@ #include #endif -#include "rods.hpp" -#include "rcConnect.hpp" +#include "rods.h" +#include "rcConnect.h" #include "fileOpen.hpp" -#include "dataObjInpOut.hpp" +#include "dataObjInpOut.h" #include "dataCopy.hpp" #include "structFileSync.hpp" /* JMC */ diff --git a/iRODS/server/core/include/objDesc.hpp b/iRODS/server/core/include/objDesc.hpp index cd50aed93c..458ef4ac2a 100644 --- a/iRODS/server/core/include/objDesc.hpp +++ b/iRODS/server/core/include/objDesc.hpp @@ -9,9 +9,9 @@ #ifndef OBJ_DESC_HPP #define OBJ_DESC_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "fileRename.hpp" #include "miscUtil.hpp" #include "structFileSync.hpp" diff --git a/iRODS/server/core/include/objMetaOpr.hpp b/iRODS/server/core/include/objMetaOpr.hpp index d0e10c7afe..df69d63663 100644 --- a/iRODS/server/core/include/objMetaOpr.hpp +++ b/iRODS/server/core/include/objMetaOpr.hpp @@ -9,9 +9,9 @@ #ifndef OBJ_META_OPR_HPP #define OBJ_META_OPR_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "rcGlobalExtern.hpp" #include "rsGlobalExtern.hpp" diff --git a/iRODS/server/core/include/physPath.hpp b/iRODS/server/core/include/physPath.hpp index eaa7be1e5e..dd0b918a8e 100644 --- a/iRODS/server/core/include/physPath.hpp +++ b/iRODS/server/core/include/physPath.hpp @@ -9,9 +9,9 @@ #ifndef PHYS_PATH_HPP #define PHYS_PATH_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "fileRename.hpp" #include "miscUtil.hpp" #include "structFileSync.hpp" diff --git a/iRODS/server/core/include/reServerLib.hpp b/iRODS/server/core/include/reServerLib.hpp index d56518358e..f0553e6864 100644 --- a/iRODS/server/core/include/reServerLib.hpp +++ b/iRODS/server/core/include/reServerLib.hpp @@ -9,9 +9,9 @@ #ifndef RE_SERVER_LIB_HPP #define RE_SERVER_LIB_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "ruleExecSubmit.hpp" #include "rcGlobalExtern.hpp" #include "rsGlobalExtern.hpp" diff --git a/iRODS/server/core/include/readServerConfig.hpp b/iRODS/server/core/include/readServerConfig.hpp index d858e8c44f..09d8576822 100644 --- a/iRODS/server/core/include/readServerConfig.hpp +++ b/iRODS/server/core/include/readServerConfig.hpp @@ -14,7 +14,7 @@ #ifndef READ_SERVER_CONFIG_HPP #define READ_SERVER_CONFIG_HPP -#include "rods.hpp" +#include "rods.h" #include "authenticate.hpp" /* server host configuration */ diff --git a/iRODS/server/core/include/resource.hpp b/iRODS/server/core/include/resource.hpp index afeab9a689..51eaf8e6f4 100644 --- a/iRODS/server/core/include/resource.hpp +++ b/iRODS/server/core/include/resource.hpp @@ -10,9 +10,9 @@ #define RESOURCE_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "ruleExecSubmit.hpp" #include "rcGlobalExtern.hpp" #include "rsGlobalExtern.hpp" diff --git a/iRODS/server/core/include/rodsAgent.hpp b/iRODS/server/core/include/rodsAgent.hpp index b1cd02bf6b..28d6902c8d 100644 --- a/iRODS/server/core/include/rodsAgent.hpp +++ b/iRODS/server/core/include/rodsAgent.hpp @@ -9,13 +9,13 @@ #ifndef RODS_AGENT_HPP #define RODS_AGENT_HPP -#include "rods.hpp" +#include "rods.h" #include "rcGlobalExtern.hpp" /* client global */ #include "rsLog.hpp" -#include "rodsLog.hpp" -#include "sockComm.hpp" -#include "getRodsEnv.hpp" -#include "rcConnect.hpp" +#include "rodsLog.h" +#include "sockComm.h" +#include "getRodsEnv.h" +#include "rcConnect.h" #define MAX_MSG_READ_RETRY 1 #define READ_RETRY_SLEEP_TIME 1 diff --git a/iRODS/server/core/include/rodsConnect.h b/iRODS/server/core/include/rodsConnect.h index 4d06c0d947..a03dbc0704 100644 --- a/iRODS/server/core/include/rodsConnect.h +++ b/iRODS/server/core/include/rodsConnect.h @@ -2,7 +2,7 @@ #define RODS_CONNECT_H #include "rodsDef.h" -#include "rcConnect.hpp" +#include "rcConnect.h" #ifndef windows_platform #define HOST_CONFIG_FILE "hosts_config.json" diff --git a/iRODS/server/core/include/rodsServer.hpp b/iRODS/server/core/include/rodsServer.hpp index a36daa73b6..1321181f6e 100644 --- a/iRODS/server/core/include/rodsServer.hpp +++ b/iRODS/server/core/include/rodsServer.hpp @@ -19,14 +19,14 @@ #include #endif -#include "rods.hpp" +#include "rods.h" #include "rcGlobalExtern.hpp" /* client global */ #include "rsLog.hpp" -#include "rodsLog.hpp" -#include "sockComm.hpp" +#include "rodsLog.h" +#include "sockComm.h" #include "rsIcatOpr.hpp" -#include "getRodsEnv.hpp" -#include "rcConnect.hpp" +#include "getRodsEnv.h" +#include "rcConnect.h" extern char *optarg; diff --git a/iRODS/server/core/include/rsApiHandler.hpp b/iRODS/server/core/include/rsApiHandler.hpp index 69194a76f0..060c13e841 100644 --- a/iRODS/server/core/include/rsApiHandler.hpp +++ b/iRODS/server/core/include/rsApiHandler.hpp @@ -9,7 +9,7 @@ #ifndef RS_API_HANDLER_HPP #define RS_API_HANDLER_HPP -#include "rods.hpp" +#include "rods.h" #include "apiHandler.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/iRODS/server/core/include/rsGlobal.hpp b/iRODS/server/core/include/rsGlobal.hpp index aab5b12596..703755c9bc 100644 --- a/iRODS/server/core/include/rsGlobal.hpp +++ b/iRODS/server/core/include/rsGlobal.hpp @@ -7,7 +7,7 @@ #define RS_GLOBAL_HPP //#include "apiTable.hpp" /* contains global RsApiTable */ -#include "rods.hpp" +#include "rods.h" #include "fileOpr.hpp" #include "dataObjOpr.hpp" #include "miscUtil.hpp" diff --git a/iRODS/server/core/include/rsGlobalExtern.hpp b/iRODS/server/core/include/rsGlobalExtern.hpp index b020d84883..157ff14bfc 100644 --- a/iRODS/server/core/include/rsGlobalExtern.hpp +++ b/iRODS/server/core/include/rsGlobalExtern.hpp @@ -7,7 +7,7 @@ #ifndef RS_GLOBAL_EXTERN_HPP #define RS_GLOBAL_EXTERN_HPP -#include "rods.hpp" +#include "rods.h" #include "apiHandler.hpp" #include "fileOpr.hpp" #include "objDesc.hpp" diff --git a/iRODS/server/core/include/rsIcatOpr.hpp b/iRODS/server/core/include/rsIcatOpr.hpp index 8cd5c61780..d13fdeaf1c 100644 --- a/iRODS/server/core/include/rsIcatOpr.hpp +++ b/iRODS/server/core/include/rsIcatOpr.hpp @@ -9,8 +9,8 @@ #ifndef RS_ICAT_OPR_HPP #define RS_ICAT_OPR_HPP -#include "rods.hpp" -#include "getRodsEnv.hpp" +#include "rods.h" +#include "getRodsEnv.h" int connectRcat(); diff --git a/iRODS/server/core/include/rsLog.hpp b/iRODS/server/core/include/rsLog.hpp index 60c4c3aa26..cca6fccaaa 100644 --- a/iRODS/server/core/include/rsLog.hpp +++ b/iRODS/server/core/include/rsLog.hpp @@ -6,7 +6,7 @@ #ifndef RS_LOG_HPP #define RS_LOG_HPP -#include "rods.hpp" +#include "rods.h" #define RODS_LOGFILE "rodsLog" #define RULE_EXEC_LOGFILE "reLog" diff --git a/iRODS/server/core/include/specColl.hpp b/iRODS/server/core/include/specColl.hpp index 4b143f0ad8..1f4f228d08 100644 --- a/iRODS/server/core/include/specColl.hpp +++ b/iRODS/server/core/include/specColl.hpp @@ -9,9 +9,9 @@ #ifndef SPEC_COLL_HPP #define SPEC_COLL_HPP -#include "rods.hpp" -#include "objInfo.hpp" -#include "dataObjInpOut.hpp" +#include "rods.h" +#include "objInfo.h" +#include "dataObjInpOut.h" #include "ruleExecSubmit.hpp" #include "rcGlobalExtern.hpp" #include "rsGlobalExtern.hpp" diff --git a/iRODS/server/core/include/xmsgLib.hpp b/iRODS/server/core/include/xmsgLib.hpp index e44149a06f..7d21bdeae1 100644 --- a/iRODS/server/core/include/xmsgLib.hpp +++ b/iRODS/server/core/include/xmsgLib.hpp @@ -9,15 +9,15 @@ #ifndef XMSG_LIB_HPP #define XMSG_LIB_HPP -#include "rods.hpp" +#include "rods.h" #include "rsGlobalExtern.hpp" /* server global */ #include "rcGlobalExtern.hpp" /* client global */ #include "rsLog.hpp" -#include "rodsLog.hpp" -#include "sockComm.hpp" -#include "getRodsEnv.hpp" -#include "rcConnect.hpp" -#include "rodsXmsg.hpp" +#include "rodsLog.h" +#include "sockComm.h" +#include "getRodsEnv.h" +#include "rcConnect.h" +#include "rodsXmsg.h" #define REQ_MSG_TIMEOUT_TIME 5 /* 5 sec timeout for req msg */ diff --git a/iRODS/server/core/src/collection.cpp b/iRODS/server/core/src/collection.cpp index c5af80c455..9c99a34d94 100644 --- a/iRODS/server/core/src/collection.cpp +++ b/iRODS/server/core/src/collection.cpp @@ -5,7 +5,7 @@ #include "collection.hpp" #include "specColl.hpp" #include "genQuery.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "irods_virtual_path.hpp" diff --git a/iRODS/server/core/src/dataObjOpr.cpp b/iRODS/server/core/src/dataObjOpr.cpp index 691b7adb1b..9d5eea419e 100644 --- a/iRODS/server/core/src/dataObjOpr.cpp +++ b/iRODS/server/core/src/dataObjOpr.cpp @@ -20,7 +20,7 @@ #include "icatHighLevelRoutines.hpp" #include "reSysDataObjOpr.hpp" #include "miscUtil.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "rsIcatOpr.hpp" // =-=-=-=-=-=-=- diff --git a/iRODS/server/core/src/irods_resource_redirect.cpp b/iRODS/server/core/src/irods_resource_redirect.cpp index df46a7dc85..28cd56a724 100644 --- a/iRODS/server/core/src/irods_resource_redirect.cpp +++ b/iRODS/server/core/src/irods_resource_redirect.cpp @@ -1,7 +1,7 @@ // =-=-=-=-=-=-= // irods includes #include "miscServerFunct.hpp" -#include "objInfo.hpp" +#include "objInfo.h" #include "dataObjCreate.hpp" #include "specColl.hpp" #include "collection.hpp" diff --git a/iRODS/server/core/src/irods_server_control_plane.cpp b/iRODS/server/core/src/irods_server_control_plane.cpp index 259f99ba1d..11e9479d51 100644 --- a/iRODS/server/core/src/irods_server_control_plane.cpp +++ b/iRODS/server/core/src/irods_server_control_plane.cpp @@ -9,7 +9,7 @@ #include "genQuery.hpp" #include "rcMisc.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include "miscServerFunct.hpp" #include "irods_log.hpp" diff --git a/iRODS/server/core/src/irods_server_state.cpp b/iRODS/server/core/src/irods_server_state.cpp index 9fdd36ec56..d59d38ab5e 100644 --- a/iRODS/server/core/src/irods_server_state.cpp +++ b/iRODS/server/core/src/irods_server_state.cpp @@ -1,6 +1,6 @@ -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include "irods_server_state.hpp" namespace irods { diff --git a/iRODS/server/core/src/miscServerFunct.cpp b/iRODS/server/core/src/miscServerFunct.cpp index 7aa7ab7711..21a14fe1b0 100644 --- a/iRODS/server/core/src/miscServerFunct.cpp +++ b/iRODS/server/core/src/miscServerFunct.cpp @@ -21,7 +21,7 @@ #include "dataObjWrite.hpp" #include "dataObjRead.hpp" #include "rcPortalOpr.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "rodsConnect.h" #include "reFuncDefs.hpp" #include diff --git a/iRODS/server/core/src/objDesc.cpp b/iRODS/server/core/src/objDesc.cpp index a92d2ca168..42a3b9671a 100644 --- a/iRODS/server/core/src/objDesc.cpp +++ b/iRODS/server/core/src/objDesc.cpp @@ -20,7 +20,7 @@ #include "reDefines.hpp" #include "reSysDataObjOpr.hpp" #include "genQuery.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "reFuncDefs.hpp" // =-=-=-=-=-=-=- diff --git a/iRODS/server/core/src/objMetaOpr.cpp b/iRODS/server/core/src/objMetaOpr.cpp index fa590d8c98..a7cf1e4c25 100644 --- a/iRODS/server/core/src/objMetaOpr.cpp +++ b/iRODS/server/core/src/objMetaOpr.cpp @@ -14,7 +14,7 @@ #include "genQuery.hpp" #include "icatHighLevelRoutines.hpp" #include "miscUtil.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "rsIcatOpr.hpp" // =-=-=-=-=-=- diff --git a/iRODS/server/core/src/physPath.cpp b/iRODS/server/core/src/physPath.cpp index 6fa1d222cc..044ec13b44 100644 --- a/iRODS/server/core/src/physPath.cpp +++ b/iRODS/server/core/src/physPath.cpp @@ -23,7 +23,7 @@ #include "reDefines.hpp" #include "reSysDataObjOpr.hpp" #include "genQuery.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "readServerConfig.hpp" #include "reFuncDefs.hpp" diff --git a/iRODS/server/core/src/reServerLib.cpp b/iRODS/server/core/src/reServerLib.cpp index 90ebe50b31..0ad392c2ab 100644 --- a/iRODS/server/core/src/reServerLib.cpp +++ b/iRODS/server/core/src/reServerLib.cpp @@ -15,7 +15,7 @@ #include "icatHighLevelRoutines.hpp" #include "reSysDataObjOpr.hpp" #include "miscUtil.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "rsIcatOpr.hpp" #include "resource.hpp" #include "reFuncDefs.hpp" diff --git a/iRODS/server/core/src/rodsAgent.cpp b/iRODS/server/core/src/rodsAgent.cpp index dfe276fbe5..efde25f51a 100644 --- a/iRODS/server/core/src/rodsAgent.cpp +++ b/iRODS/server/core/src/rodsAgent.cpp @@ -36,6 +36,7 @@ static void NtAgentSetEnvsFromArgs( int ac, char **av ); #include "readServerConfig.hpp" #include "sockCommNetworkInterface.hpp" +#include "sslSockComm.h" int getAgentProcCnt() { return 0; diff --git a/iRODS/server/core/src/rsApiHandler.cpp b/iRODS/server/core/src/rsApiHandler.cpp index c80507cbea..1d74af6895 100644 --- a/iRODS/server/core/src/rsApiHandler.cpp +++ b/iRODS/server/core/src/rsApiHandler.cpp @@ -12,7 +12,7 @@ #include "regReplica.hpp" #include "unregDataObj.hpp" #include "modAVUMetadata.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include #include diff --git a/iRODS/server/core/src/specColl.cpp b/iRODS/server/core/src/specColl.cpp index c9e5f41cab..e950eb74d7 100644 --- a/iRODS/server/core/src/specColl.cpp +++ b/iRODS/server/core/src/specColl.cpp @@ -7,7 +7,7 @@ #include "collection.hpp" #include "resource.hpp" #include "genQuery.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" // =-=-=-=-=-=-=- #include "irods_resource_backport.hpp" diff --git a/iRODS/server/drivers/include/fileDriver.hpp b/iRODS/server/drivers/include/fileDriver.hpp index 355f70cb12..8da30447a0 100644 --- a/iRODS/server/drivers/include/fileDriver.hpp +++ b/iRODS/server/drivers/include/fileDriver.hpp @@ -13,9 +13,9 @@ #include #endif -#include "rods.hpp" -#include "rcConnect.hpp" -#include "objInfo.hpp" +#include "rods.h" +#include "rcConnect.h" +#include "objInfo.h" #include "msParam.hpp" // =-=-=-=-=-=-=- diff --git a/iRODS/server/icat/include/icatHighLevelRoutines.hpp b/iRODS/server/icat/include/icatHighLevelRoutines.hpp index 762dd7a5df..72dc7d301d 100644 --- a/iRODS/server/icat/include/icatHighLevelRoutines.hpp +++ b/iRODS/server/icat/include/icatHighLevelRoutines.hpp @@ -5,9 +5,9 @@ #ifndef ICAT_HIGHLEVEL_ROUTINES_HPP #define ICAT_HIGHLEVEL_ROUTINES_HPP -#include "objInfo.hpp" +#include "objInfo.h" #include "ruleExecSubmit.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "icatStructs.hpp" #include "rodsGeneralUpdate.hpp" #include "specificQuery.hpp" diff --git a/iRODS/server/re/include/datetime.hpp b/iRODS/server/re/include/datetime.hpp index 42fc4adccc..e675f2a018 100644 --- a/iRODS/server/re/include/datetime.hpp +++ b/iRODS/server/re/include/datetime.hpp @@ -6,7 +6,7 @@ #include #include "debug.hpp" #ifndef DEBUG -#include "rodsType.hpp" +#include "rodsType.h" #endif #include #include diff --git a/iRODS/server/re/include/irods_operation_rule_execution_manager.hpp b/iRODS/server/re/include/irods_operation_rule_execution_manager.hpp index 7d3e8d8e16..d1217c59b3 100644 --- a/iRODS/server/re/include/irods_operation_rule_execution_manager.hpp +++ b/iRODS/server/re/include/irods_operation_rule_execution_manager.hpp @@ -3,7 +3,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rcConnect.hpp" +#include "rcConnect.h" // =-=-=-=-=-=-=- #include "irods_operation_rule_execution_manager_base.hpp" diff --git a/iRODS/server/re/include/msiHelper.hpp b/iRODS/server/re/include/msiHelper.hpp index ed9bb4f10d..ad84fc7f22 100644 --- a/iRODS/server/re/include/msiHelper.hpp +++ b/iRODS/server/re/include/msiHelper.hpp @@ -9,7 +9,7 @@ #ifndef MSI_HELPER_HPP #define MSI_HELPER_HPP -#include "rods.hpp" +#include "rods.h" #include "objMetaOpr.hpp" #include "dataObjRepl.hpp" #include "reGlobalsExtern.hpp" diff --git a/iRODS/server/re/include/parser.hpp b/iRODS/server/re/include/parser.hpp index 825268553b..5370d2a60d 100644 --- a/iRODS/server/re/include/parser.hpp +++ b/iRODS/server/re/include/parser.hpp @@ -12,7 +12,7 @@ #ifndef DEBUG -#include "objInfo.hpp" +#include "objInfo.h" #include "reHelpers1.hpp" #endif diff --git a/iRODS/server/re/include/reAction.hpp b/iRODS/server/re/include/reAction.hpp index 0756f23701..764abd3b5a 100644 --- a/iRODS/server/re/include/reAction.hpp +++ b/iRODS/server/re/include/reAction.hpp @@ -4,11 +4,11 @@ #ifndef _RE_ACTION_HPP_ #define _RE_ACTION_HPP_ -#include "rodsUser.hpp" -#include "rods.hpp" +#include "rodsUser.h" +#include "rods.h" #include "rcGlobalExtern.hpp" #include "reDefines.hpp" -#include "objInfo.hpp" +#include "objInfo.h" #include "regExpMatch.hpp" #include "reSysDataObjOpr.hpp" #include "msiHelper.hpp" diff --git a/iRODS/server/re/include/reDataObjOpr.hpp b/iRODS/server/re/include/reDataObjOpr.hpp index e4987a5bd0..7fbf205187 100644 --- a/iRODS/server/re/include/reDataObjOpr.hpp +++ b/iRODS/server/re/include/reDataObjOpr.hpp @@ -5,7 +5,7 @@ #ifndef RE_DATA_OBJ_OPR_HPP #define RE_DATA_OBJ_OPR_HPP -#include "rods.hpp" +#include "rods.h" #include "objMetaOpr.hpp" #include "dataObjRepl.hpp" #include "reGlobalsExtern.hpp" diff --git a/iRODS/server/re/include/reGlobalsExtern.hpp b/iRODS/server/re/include/reGlobalsExtern.hpp index 0780249832..66fa402b65 100644 --- a/iRODS/server/re/include/reGlobalsExtern.hpp +++ b/iRODS/server/re/include/reGlobalsExtern.hpp @@ -19,16 +19,16 @@ extern void myfree(char* file, int line, void *x); #endif ***/ -#include "rodsUser.hpp" -#include "rods.hpp" +#include "rodsUser.h" +#include "rods.h" #include "rcGlobalExtern.hpp" -#include "objInfo.hpp" +#include "objInfo.h" #include "fileOpen.hpp" #include "regExpMatch.hpp" #include "reDefines.hpp" #include "ruleExecSubmit.hpp" #include "ruleExecDel.hpp" -#include "dataObjInpOut.hpp" +#include "dataObjInpOut.h" #include "msParam.hpp" #include "modAccessControl.hpp" diff --git a/iRODS/server/re/include/reIn2p3SysRule.hpp b/iRODS/server/re/include/reIn2p3SysRule.hpp index b60f8d7f0f..d6e400819f 100644 --- a/iRODS/server/re/include/reIn2p3SysRule.hpp +++ b/iRODS/server/re/include/reIn2p3SysRule.hpp @@ -7,15 +7,15 @@ #include "msParam.hpp" #include "reDataObjOpr.hpp" -#include "rods.hpp" +#include "rods.h" #include "rsGlobalExtern.hpp" /* server global */ #include "rcGlobalExtern.hpp" /* client global */ #include "reGlobalsExtern.hpp" #include "rsLog.hpp" -#include "rodsLog.hpp" -#include "sockComm.hpp" -#include "getRodsEnv.hpp" -#include "rcConnect.hpp" +#include "rodsLog.h" +#include "sockComm.h" +#include "getRodsEnv.h" +#include "rcConnect.h" #include "generalRowInsert.hpp" #include "generalRowPurge.hpp" #include "generalAdmin.hpp" diff --git a/iRODS/server/re/include/reNaraMetaData.hpp b/iRODS/server/re/include/reNaraMetaData.hpp index b53d4372b3..19060098e0 100644 --- a/iRODS/server/re/include/reNaraMetaData.hpp +++ b/iRODS/server/re/include/reNaraMetaData.hpp @@ -9,7 +9,7 @@ #ifndef RE_NARA_META_DATA_HPP #define RE_NARA_META_DATA_HPP -#include "rods.hpp" +#include "rods.h" #include "objMetaOpr.hpp" #include "dataObjRepl.hpp" #include "reGlobalsExtern.hpp" diff --git a/iRODS/server/re/include/reSysDataObjOpr.hpp b/iRODS/server/re/include/reSysDataObjOpr.hpp index be8decb8c3..cd582e5938 100644 --- a/iRODS/server/re/include/reSysDataObjOpr.hpp +++ b/iRODS/server/re/include/reSysDataObjOpr.hpp @@ -9,7 +9,7 @@ #ifndef RE_SYS_DATA_OBJ_OPR_HPP #define RE_SYS_DATA_OBJ_OPR_HPP -#include "rods.hpp" +#include "rods.h" #include "objMetaOpr.hpp" #include "dataObjRepl.hpp" #include "modDataObjMeta.hpp" diff --git a/iRODS/server/re/include/reVariables.hpp b/iRODS/server/re/include/reVariables.hpp index ccc93b5dd4..8da59e400b 100644 --- a/iRODS/server/re/include/reVariables.hpp +++ b/iRODS/server/re/include/reVariables.hpp @@ -6,11 +6,11 @@ #ifndef RE_VARIABLES_HPP #define RE_VARIABLES_HPP -#include "rodsUser.hpp" -#include "rods.hpp" +#include "rodsUser.h" +#include "rods.h" #include "rcGlobalExtern.hpp" #include "reDefines.hpp" -#include "objInfo.hpp" +#include "objInfo.h" #include "regExpMatch.hpp" /************* diff --git a/iRODS/server/re/include/restructs.hpp b/iRODS/server/re/include/restructs.hpp index 8a549c347d..fc64fb3715 100644 --- a/iRODS/server/re/include/restructs.hpp +++ b/iRODS/server/re/include/restructs.hpp @@ -10,7 +10,7 @@ #include #include "reGlobalsExtern.hpp" #ifndef DEBUG -#include "rodsType.hpp" +#include "rodsType.h" #include "msParam.hpp" #endif diff --git a/iRODS/server/re/include/utils.hpp b/iRODS/server/re/include/utils.hpp index f0d075210b..f9c3412ec3 100644 --- a/iRODS/server/re/include/utils.hpp +++ b/iRODS/server/re/include/utils.hpp @@ -9,9 +9,9 @@ #include #include #ifndef DEBUG -#include "objInfo.hpp" +#include "objInfo.h" #include "reHelpers1.hpp" -#include "rodsType.hpp" +#include "rodsType.h" #endif #include "restructs.hpp" #include "region.hpp" diff --git a/iRODS/server/re/src/WhatToDoWhenYouChangeREIStructure.txt b/iRODS/server/re/src/WhatToDoWhenYouChangeREIStructure.txt index 0925974566..c2ba600766 100644 --- a/iRODS/server/re/src/WhatToDoWhenYouChangeREIStructure.txt +++ b/iRODS/server/re/src/WhatToDoWhenYouChangeREIStructure.txt @@ -29,7 +29,7 @@ also need to be modified in the file reVariableMap.cpp IMPORTANT, this applies to any sub or sub-sub... structure that is changed underneath :-( -For example assume that the collInfo_t struct is modified (objInfo.hpp) +For example assume that the collInfo_t struct is modified (objInfo.h) Then the following related functions need to be changed also to reflect those changes: diff --git a/iRODS/server/re/src/conversion.cpp b/iRODS/server/re/src/conversion.cpp index 01a69e46e6..846604fd95 100644 --- a/iRODS/server/re/src/conversion.cpp +++ b/iRODS/server/re/src/conversion.cpp @@ -4,7 +4,7 @@ #include "index.hpp" #include "datetime.hpp" #ifndef DEBUG -#include "rodsType.hpp" +#include "rodsType.h" #endif diff --git a/iRODS/server/re/src/functions.cpp b/iRODS/server/re/src/functions.cpp index 814b8a5b88..9ed1e90d5b 100644 --- a/iRODS/server/re/src/functions.cpp +++ b/iRODS/server/re/src/functions.cpp @@ -23,7 +23,7 @@ getDataObjInfoIncSpecColl( rsComm_t *rsComm, dataObjInp_t *dataObjInp, #include "execMyRule.hpp" #include "msParam.hpp" #include "reFuncDefs.hpp" -#include "stringOpr.hpp" +#include "stringOpr.h" #include "miscServerFunct.hpp" #endif diff --git a/iRODS/server/re/src/nre.systemMS.cpp b/iRODS/server/re/src/nre.systemMS.cpp index 5c4548d23a..4a8744b98a 100644 --- a/iRODS/server/re/src/nre.systemMS.cpp +++ b/iRODS/server/re/src/nre.systemMS.cpp @@ -16,7 +16,7 @@ #include "irods_plugin_name_generator.hpp" #include "irods_load_plugin.hpp" #include "reFuncDefs.hpp" -#include "sockComm.hpp" +#include "sockComm.h" #include "irods_server_properties.hpp" #include "irods_log.hpp" diff --git a/iRODS/server/re/src/reIn2p3SysRule.cpp b/iRODS/server/re/src/reIn2p3SysRule.cpp index 979f9ed47e..0fc5f5c613 100644 --- a/iRODS/server/re/src/reIn2p3SysRule.cpp +++ b/iRODS/server/re/src/reIn2p3SysRule.cpp @@ -21,7 +21,7 @@ static pthread_mutex_t my_mutex; #include "irods_get_full_path_for_config_file.hpp" #include "irods_configuration_parser.hpp" -#include "rodsErrorTable.hpp" +#include "rodsErrorTable.h" #include #include #include diff --git a/iRODS/server/re/src/xmsgMS.cpp b/iRODS/server/re/src/xmsgMS.cpp index 6c8465624e..a4b1aacd33 100644 --- a/iRODS/server/re/src/xmsgMS.cpp +++ b/iRODS/server/re/src/xmsgMS.cpp @@ -7,7 +7,7 @@ *** For more information please refer to files in the COPYRIGHT directory ***/ #include "reGlobalsExtern.hpp" #include "icatHighLevelRoutines.hpp" -#include "rodsXmsg.hpp" +#include "rodsXmsg.h" #include "getXmsgTicket.hpp" #include "sendXmsg.hpp" #include "rcvXmsg.hpp" diff --git a/iRODS/server/test/src/TestBase.hpp b/iRODS/server/test/src/TestBase.hpp index 3476ccede8..8e828974e3 100644 --- a/iRODS/server/test/src/TestBase.hpp +++ b/iRODS/server/test/src/TestBase.hpp @@ -1,7 +1,7 @@ #include #include #include "gtest/gtest.h" -#include "rods.hpp" +#include "rods.h" #include "icatLowLevelOdbc.hpp" class TestBase : public ::testing::Test { diff --git a/iRODS/server/test/src/TestCHL.cpp b/iRODS/server/test/src/TestCHL.cpp index 8cc084ccd7..6b9cd89748 100644 --- a/iRODS/server/test/src/TestCHL.cpp +++ b/iRODS/server/test/src/TestCHL.cpp @@ -1,10 +1,10 @@ #include #include #include "TestBase.hpp" -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include "readServerConfig.hpp" -#include "rodsUser.hpp" +#include "rodsUser.h" #include "icatHighLevelRoutines.hpp" #include "icatMidLevelRoutines.hpp" diff --git a/iRODS/server/test/src/test_chl.cpp b/iRODS/server/test/src/test_chl.cpp index b0625eabbb..1222b6508a 100644 --- a/iRODS/server/test/src/test_chl.cpp +++ b/iRODS/server/test/src/test_chl.cpp @@ -4,13 +4,13 @@ ICAT test program. */ -#include "rodsClient.hpp" -#include "parseCommandLine.hpp" +#include "rodsClient.h" +#include "parseCommandLine.h" #include "readServerConfig.hpp" #include "irods_server_properties.hpp" #include "checksum.hpp" -#include "rodsUser.hpp" +#include "rodsUser.h" #include "icatHighLevelRoutines.hpp" //#include "icatMidLevelRoutines.hpp" diff --git a/iRODS/server/test/src/test_cll.cpp b/iRODS/server/test/src/test_cll.cpp index d3c5c06331..1fa7765e88 100644 --- a/iRODS/server/test/src/test_cll.cpp +++ b/iRODS/server/test/src/test_cll.cpp @@ -4,7 +4,7 @@ Simple program to test the Rcat Low Level routines to Postgres or Oracle. */ -#include "rods.hpp" +#include "rods.h" #include "readServerConfig.hpp" #include "irods_plugin_name_generator.hpp" diff --git a/iRODS/server/test/src/test_rda.cpp b/iRODS/server/test/src/test_rda.cpp index 1b00febaea..d0232bcc76 100644 --- a/iRODS/server/test/src/test_rda.cpp +++ b/iRODS/server/test/src/test_rda.cpp @@ -4,7 +4,7 @@ RDA test program. */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "rdaHighLevelRoutines.hpp" /* diff --git a/packaging/irods-dev.list.template b/packaging/irods-dev.list.template index c1729d1981..5fd97982c0 100644 --- a/packaging/irods-dev.list.template +++ b/packaging/irods-dev.list.template @@ -76,6 +76,36 @@ f 644 root root /usr/include/irods/ ./iRODS/server/icat/include/* f 644 root root /usr/include/irods/ ./iRODS/server/re/include/* f 644 root root /usr/include/irods/ ./iRODS/server/drivers/include/* +# These links are to support old header locations +l 644 root root /usr/include/irods/dataObjInpOut.hpp /usr/include/irods/dataObjInpOut.h +l 644 root root /usr/include/irods/getRodsEnv.hpp /usr/include/irods/getRodsEnv.h +l 644 root root /usr/include/irods/guiProgressCallback.hpp /usr/include/irods/guiProgressCallback.h +l 644 root root /usr/include/irods/obf.hpp /usr/include/irods/obf.h +l 644 root root /usr/include/irods/objInfo.hpp /usr/include/irods/objInfo.h +l 644 root root /usr/include/irods/osauth.hpp /usr/include/irods/osauth.h +l 644 root root /usr/include/irods/parseCommandLine.hpp /usr/include/irods/parseCommandLine.h +l 644 root root /usr/include/irods/rcConnect.hpp /usr/include/irods/rcConnect.h +l 644 root root /usr/include/irods/rods.hpp /usr/include/irods/rods.h +l 644 root root /usr/include/irods/rodsClient.hpp /usr/include/irods/rodsClient.h +l 644 root root /usr/include/irods/rodsError.hpp /usr/include/irods/rodsError.h +l 644 root root /usr/include/irods/rodsErrorTable.hpp /usr/include/irods/rodsErrorTable.h +l 644 root root /usr/include/irods/rodsGenQuery.hpp /usr/include/irods/rodsGenQuery.h +l 644 root root /usr/include/irods/rodsKeyWdDef.hpp /usr/include/irods/rodsKeyWdDef.h +l 644 root root /usr/include/irods/rodsLog.hpp /usr/include/irods/rodsLog.h +l 644 root root /usr/include/irods/rodsQuota.hpp /usr/include/irods/rodsQuota.h +l 644 root root /usr/include/irods/rodsType.hpp /usr/include/irods/rodsType.h +l 644 root root /usr/include/irods/rodsUser.hpp /usr/include/irods/rodsUser.h +l 644 root root /usr/include/irods/rodsVersion.hpp /usr/include/irods/rodsVersion.h +l 644 root root /usr/include/irods/rodsXmsg.hpp /usr/include/irods/rodsXmsg.h +l 644 root root /usr/include/irods/sslSockComm.hpp /usr/include/irods/sslSockComm.h +l 644 root root /usr/include/irods/stringOpr.hpp /usr/include/irods/stringOpr.h +l 644 root root /usr/include/irods/apiNumber.hpp /usr/include/irods/apiNumber.hpp +l 644 root root /usr/include/irods/objStat.hpp /usr/include/irods/objStat.hpp +l 644 root root /usr/include/irods/procApiRequest.hpp /usr/include/irods/procApiRequest.hpp +l 644 root root /usr/include/irods/rodsPackInstruct.hpp /usr/include/irods/rodsPackInstruct.hpp +l 644 root root /usr/include/irods/rodsPath.hpp /usr/include/irods/rodsPath.hpp +l 644 root root /usr/include/irods/sockComm.hpp /usr/include/irods/sockComm.hpp + d 755 root root /usr/share/irods/ - d 755 root root /usr/share/irods/examples d 755 root root /usr/share/irods/examples/microservices diff --git a/packaging/irods.list.template b/packaging/irods.list.template index f1e8e23aa5..ede5f94a08 100644 --- a/packaging/irods.list.template +++ b/packaging/irods.list.template @@ -402,7 +402,6 @@ f 644 root root ${IRODS_HOME}/scripts/perl/irodsctl.pl ./iRODS/scripts/perl/irod f 644 root root ${IRODS_HOME}/scripts/perl/utils_prompt.pl ./iRODS/scripts/perl/utils_prompt.pl f 644 root root ${IRODS_HOME}/scripts/perl/irods_setup.pl ./iRODS/scripts/perl/irods_setup.pl f 644 root root ${IRODS_HOME}/scripts/perl/irods_get_config_dir.pl ./iRODS/scripts/perl/irods_get_config_dir.pl -f 755 root root ${IRODS_HOME}/scripts/perl/updateRodsLog.pl ./iRODS/scripts/perl/updateRodsLog.pl f 644 root root ${IRODS_HOME}/scripts/perl/utils_print.pl ./iRODS/scripts/perl/utils_print.pl f 644 root root ${IRODS_HOME}/scripts/perl/utils_config.pl ./iRODS/scripts/perl/utils_config.pl f 755 root root ${IRODS_HOME}/scripts/perl/joinlines.pl ./iRODS/scripts/perl/joinlines.pl diff --git a/plugins/api/src/helloworld.cpp b/plugins/api/src/helloworld.cpp index c0934cc57a..f55501bb67 100644 --- a/plugins/api/src/helloworld.cpp +++ b/plugins/api/src/helloworld.cpp @@ -4,7 +4,7 @@ #include "irods_stacktrace.hpp" #include "irods_server_api_call.hpp" -#include "objStat.hpp" +#include "objStat.h" // =-=-=-=-=-=-=- // stl includes diff --git a/plugins/auth/native/libnative.cpp b/plugins/auth/native/libnative.cpp index 2402bdca08..a3a6e04697 100644 --- a/plugins/auth/native/libnative.cpp +++ b/plugins/auth/native/libnative.cpp @@ -3,7 +3,7 @@ #include "rodsDef.h" #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "authRequest.hpp" #include "authResponse.hpp" #include "authCheck.hpp" diff --git a/plugins/auth/osauth/libosauth.cpp b/plugins/auth/osauth/libosauth.cpp index 03ab508fe1..79adf47ae7 100644 --- a/plugins/auth/osauth/libosauth.cpp +++ b/plugins/auth/osauth/libosauth.cpp @@ -1,9 +1,10 @@ // =-=-=-=-=-=-=- // irods includes #include "rodsDef.h" +#include "osauth.h" #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "authRequest.hpp" #include "authResponse.hpp" #include "authCheck.hpp" @@ -30,7 +31,7 @@ // =-=-=-=-=-=-=- // local includes #define OS_AUTH 1 -#include "osauth.hpp" +#include "osauth.h" int get64RandomBytes( char *buf ); void setSessionSignatureClientside( char* _sig ); diff --git a/plugins/auth/pam/libpam.cpp b/plugins/auth/pam/libpam.cpp index 920183922b..02243f175b 100644 --- a/plugins/auth/pam/libpam.cpp +++ b/plugins/auth/pam/libpam.cpp @@ -1,12 +1,12 @@ // =-=-=-=-=-=-=- // irods includes #define USE_SSL 1 -#include "sslSockComm.hpp" +#include "sslSockComm.h" #include "rodsDef.h" #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "authRequest.hpp" #include "authResponse.hpp" #include "authCheck.hpp" diff --git a/plugins/database/include/low_level_odbc.hpp b/plugins/database/include/low_level_odbc.hpp index dfad45ee69..2759eb3f7c 100644 --- a/plugins/database/include/low_level_odbc.hpp +++ b/plugins/database/include/low_level_odbc.hpp @@ -11,7 +11,7 @@ #include "sql.h" #include "sqlext.h" -#include "rods.hpp" +#include "rods.h" #include "mid_level.hpp" #include diff --git a/plugins/database/include/low_level_oracle.hpp b/plugins/database/include/low_level_oracle.hpp index c9d5004f16..8d1e22e039 100644 --- a/plugins/database/include/low_level_oracle.hpp +++ b/plugins/database/include/low_level_oracle.hpp @@ -9,7 +9,7 @@ #include "oci.h" -#include "rods.hpp" +#include "rods.h" #include "mid_level.hpp" #define MAX_BIND_VARS 120 // JMC - backport 4848 ( 40->120 ) diff --git a/plugins/database/include/mid_level.hpp b/plugins/database/include/mid_level.hpp index c02660a932..aa64c0c834 100644 --- a/plugins/database/include/mid_level.hpp +++ b/plugins/database/include/mid_level.hpp @@ -9,7 +9,7 @@ #ifndef ICAT_MIDLEVEL_ROUTINES_HPP #define ICAT_MIDLEVEL_ROUTINES_HPP -#include "rodsType.hpp" +#include "rodsType.h" #include "icatStructs.hpp" #include diff --git a/plugins/database/src/db_plugin.cpp b/plugins/database/src/db_plugin.cpp index f533ad309c..abeec6188b 100644 --- a/plugins/database/src/db_plugin.cpp +++ b/plugins/database/src/db_plugin.cpp @@ -1,10 +1,11 @@ // =-=-=-=-=-=-=- // irods includes #include "rodsDef.h" +#include "rodsQuota.h" #include "msParam.hpp" #include "reGlobalsExtern.hpp" #include "reFuncDefs.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "readServerConfig.hpp" #include "icatStructs.hpp" #include "icatHighLevelRoutines.hpp" @@ -33,7 +34,7 @@ // =-=-=-=-=-=-=- // irods includes -#include "rods.hpp" +#include "rods.h" #include "rcMisc.hpp" #include "miscServerFunct.hpp" diff --git a/plugins/database/src/general_query.cpp b/plugins/database/src/general_query.cpp index b7e0becd8b..c005230d1b 100644 --- a/plugins/database/src/general_query.cpp +++ b/plugins/database/src/general_query.cpp @@ -23,7 +23,7 @@ be called when the tables change to make sure there are no cycles. */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "icatHighLevelRoutines.hpp" #include "mid_level.hpp" #include "low_level.hpp" diff --git a/plugins/database/src/general_query_setup.cpp b/plugins/database/src/general_query_setup.cpp index c9e52cf8b8..aea649e451 100644 --- a/plugins/database/src/general_query_setup.cpp +++ b/plugins/database/src/general_query_setup.cpp @@ -28,7 +28,7 @@ be related together via the sql text string. This creates a tree structure describing the ICAT schema. */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "icatHighLevelRoutines.hpp" void diff --git a/plugins/database/src/general_update.cpp b/plugins/database/src/general_update.cpp index 6f9799881c..2fa91c37cb 100644 --- a/plugins/database/src/general_update.cpp +++ b/plugins/database/src/general_update.cpp @@ -14,7 +14,7 @@ */ #include "rodsGeneralUpdate.hpp" -#include "rodsClient.hpp" +#include "rodsClient.h" #include "icatHighLevelRoutines.hpp" #include "mid_level.hpp" #include "low_level.hpp" diff --git a/plugins/database/src/irods_sql_logger.cpp b/plugins/database/src/irods_sql_logger.cpp index 077601dad3..3d68e39a04 100644 --- a/plugins/database/src/irods_sql_logger.cpp +++ b/plugins/database/src/irods_sql_logger.cpp @@ -2,7 +2,7 @@ #include "irods_error.hpp" #include "irods_log.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include diff --git a/plugins/database/src/irods_zone_info.cpp b/plugins/database/src/irods_zone_info.cpp index 6b9d984cd8..d8006b340e 100644 --- a/plugins/database/src/irods_zone_info.cpp +++ b/plugins/database/src/irods_zone_info.cpp @@ -1,6 +1,6 @@ #include "irods_zone_info.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "icatHighLevelRoutines.hpp" #include "mid_level.hpp" #include "rodsDef.h" diff --git a/plugins/database/src/test_cll.cpp b/plugins/database/src/test_cll.cpp index 56fb5ab1f0..b114e141a8 100644 --- a/plugins/database/src/test_cll.cpp +++ b/plugins/database/src/test_cll.cpp @@ -4,7 +4,7 @@ Simple program to test the Rcat Low Level routines to Postgres or Oracle. */ -#include "rods.hpp" +#include "rods.h" #include "readServerConfig.hpp" #include "irods_plugin_name_generator.hpp" diff --git a/plugins/database/src/test_genq.cpp b/plugins/database/src/test_genq.cpp index 2421dcef14..275feca0c5 100644 --- a/plugins/database/src/test_genq.cpp +++ b/plugins/database/src/test_genq.cpp @@ -7,7 +7,7 @@ #include #include -#include "rodsClient.hpp" +#include "rodsClient.h" #include "readServerConfig.hpp" #include "irods_server_properties.hpp" diff --git a/plugins/database/src/test_genu.cpp b/plugins/database/src/test_genu.cpp index 8d9000eb3a..c955185857 100644 --- a/plugins/database/src/test_genu.cpp +++ b/plugins/database/src/test_genu.cpp @@ -4,7 +4,7 @@ ICAT test program for the GeneralUpdate. */ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "readServerConfig.hpp" #include "irods_server_properties.hpp" diff --git a/plugins/microservices/mso_drivers/msiobjget_http/libmsiobjget_http.cpp b/plugins/microservices/mso_drivers/msiobjget_http/libmsiobjget_http.cpp index 28354863dc..666b893c5b 100644 --- a/plugins/microservices/mso_drivers/msiobjget_http/libmsiobjget_http.cpp +++ b/plugins/microservices/mso_drivers/msiobjget_http/libmsiobjget_http.cpp @@ -1,5 +1,5 @@ //#include "rsApiHandler.hpp" -#include "rods.hpp" +#include "rods.h" #include "reFuncDefs.hpp" #include "reGlobalsExtern.hpp" #include "rsGlobalExtern.hpp" diff --git a/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp b/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp index 6637458331..9ba1bf2c57 100644 --- a/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp +++ b/plugins/microservices/mso_drivers/msiobjget_irods/libmsiobjget_irods.cpp @@ -1,6 +1,6 @@ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "reFuncDefs.hpp" -#include "rods.hpp" +#include "rods.h" #include "reGlobalsExtern.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp b/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp index b1f4a576a2..5350a449c9 100644 --- a/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp +++ b/plugins/microservices/mso_drivers/msiobjget_slink/libmsiobjget_slink.cpp @@ -1,5 +1,5 @@ -#include "rodsClient.hpp" -#include "rods.hpp" +#include "rodsClient.h" +#include "rods.h" #include "reGlobalsExtern.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/plugins/microservices/mso_drivers/msiobjput_http/libmsiobjput_http.cpp b/plugins/microservices/mso_drivers/msiobjput_http/libmsiobjput_http.cpp index 4484a399ae..9714fe7a41 100644 --- a/plugins/microservices/mso_drivers/msiobjput_http/libmsiobjput_http.cpp +++ b/plugins/microservices/mso_drivers/msiobjput_http/libmsiobjput_http.cpp @@ -1,6 +1,6 @@ #include "rsApiHandler.hpp" #include "reFuncDefs.hpp" -#include "rods.hpp" +#include "rods.h" #include "reGlobalsExtern.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/plugins/microservices/mso_drivers/msiobjput_irods/libmsiobjput_irods.cpp b/plugins/microservices/mso_drivers/msiobjput_irods/libmsiobjput_irods.cpp index 802b93a2b5..ea3b7798da 100644 --- a/plugins/microservices/mso_drivers/msiobjput_irods/libmsiobjput_irods.cpp +++ b/plugins/microservices/mso_drivers/msiobjput_irods/libmsiobjput_irods.cpp @@ -1,6 +1,6 @@ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "reFuncDefs.hpp" -#include "rods.hpp" +#include "rods.h" #include "reGlobalsExtern.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp b/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp index 9cc1cbef37..cb1491dee6 100644 --- a/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp +++ b/plugins/microservices/mso_drivers/msiobjput_slink/libmsiobjput_slink.cpp @@ -1,6 +1,6 @@ -#include "rodsClient.hpp" +#include "rodsClient.h" #include "reFuncDefs.hpp" -#include "rods.hpp" +#include "rods.h" #include "reGlobalsExtern.hpp" #include "rsGlobalExtern.hpp" #include "rcGlobalExtern.hpp" diff --git a/plugins/network/ssl/libssl.cpp b/plugins/network/ssl/libssl.cpp index 8f0fe95bdd..c150d80b9d 100644 --- a/plugins/network/ssl/libssl.cpp +++ b/plugins/network/ssl/libssl.cpp @@ -3,8 +3,8 @@ #include "rodsDef.h" #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" -#include "sockComm.hpp" +#include "rcConnect.h" +#include "sockComm.h" // =-=-=-=-=-=-=- #include "irods_network_plugin.hpp" diff --git a/plugins/network/tcp/libtcp.cpp b/plugins/network/tcp/libtcp.cpp index 706467be43..dd19d1858e 100644 --- a/plugins/network/tcp/libtcp.cpp +++ b/plugins/network/tcp/libtcp.cpp @@ -3,8 +3,8 @@ #include "rodsDef.h" #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" -#include "sockComm.hpp" +#include "rcConnect.h" +#include "sockComm.h" // =-=-=-=-=-=-=- #include "irods_network_plugin.hpp" diff --git a/plugins/resources/mockarchive/libmockarchive.cpp b/plugins/resources/mockarchive/libmockarchive.cpp index cf72f712f0..48ee2e2c79 100644 --- a/plugins/resources/mockarchive/libmockarchive.cpp +++ b/plugins/resources/mockarchive/libmockarchive.cpp @@ -2,7 +2,7 @@ // irods includes #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "miscServerFunct.hpp" // =-=-=-=-=-=-=- diff --git a/plugins/resources/mso/libmso.cpp b/plugins/resources/mso/libmso.cpp index 07d2ba1ebc..167ef14425 100644 --- a/plugins/resources/mso/libmso.cpp +++ b/plugins/resources/mso/libmso.cpp @@ -2,7 +2,7 @@ // irods includes #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "reFuncDefs.hpp" // =-=-=-=-=-=-=- diff --git a/plugins/resources/nonblocking/libnonblocking.cpp b/plugins/resources/nonblocking/libnonblocking.cpp index 29dc1dd6a3..4006f5a3b6 100644 --- a/plugins/resources/nonblocking/libnonblocking.cpp +++ b/plugins/resources/nonblocking/libnonblocking.cpp @@ -2,7 +2,7 @@ // irods includes #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "readServerConfig.hpp" #include "miscServerFunct.hpp" diff --git a/plugins/resources/replication/librepl.cpp b/plugins/resources/replication/librepl.cpp index 23337af272..fa517e4be2 100644 --- a/plugins/resources/replication/librepl.cpp +++ b/plugins/resources/replication/librepl.cpp @@ -7,7 +7,7 @@ // irods includes #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rodsLog.hpp" +#include "rodsLog.h" #include "icatHighLevelRoutines.hpp" #include "dataObjRepl.hpp" diff --git a/plugins/resources/unixfilesystem/libunixfilesystem.cpp b/plugins/resources/unixfilesystem/libunixfilesystem.cpp index b7549d38d8..69bf576f9c 100644 --- a/plugins/resources/unixfilesystem/libunixfilesystem.cpp +++ b/plugins/resources/unixfilesystem/libunixfilesystem.cpp @@ -2,7 +2,7 @@ // irods includes #include "msParam.hpp" #include "reGlobalsExtern.hpp" -#include "rcConnect.hpp" +#include "rcConnect.h" #include "readServerConfig.hpp" #include "miscServerFunct.hpp" #include "generalAdmin.hpp" From f92a0b30474ba214d59e76c4c519954188362917 Mon Sep 17 00:00:00 2001 From: Ben Keller Date: Thu, 30 Apr 2015 17:48:16 -0400 Subject: [PATCH 48/48] [#2455] Don't add python-jsonschema dep. for ub12 --- packaging/build.sh | 9 +++++++-- packaging/irods.list.template | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packaging/build.sh b/packaging/build.sh index 6c72a19470..818082f75a 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -1525,14 +1525,19 @@ elif [ "$DETECTEDOS" == "SuSE" ] ; then # SuSE elif [ "$DETECTEDOS" == "Ubuntu" -o "$DETECTEDOS" == "Debian" ] ; then # Ubuntu echo "${text_green}${text_bold}Running EPM :: Generating $DETECTEDOS DEBs${text_reset}" epmvar="DEB$SERVER_TYPE" + if [ "$DETECTEDOS" == "Ubuntu" ] ; then + if [ "12" == `python -c 'import platform; print platform.linux_distribution()[1].split(".")[0]'` ] ; then + UBUNTU12=true + fi + fi if [ "$SERVER_TYPE" == "ICAT" ] ; then - $EPMCMD $EPMOPTS -a $arch -f deb irods-icat $epmvar=true ./packaging/irods.list + $EPMCMD $EPMOPTS -a $arch -f deb irods-icat $epmvar=true UBUNTU12=$UBUNTU12 ./packaging/irods.list if [ "$FAST" == "0" ] ; then $EPMCMD $EPMOPTS -a $arch -f deb irods-dev $epmvar=true ./packaging/irods-dev.list $EPMCMD $EPMOPTS -a $arch -f deb irods-runtime $epmvar=true ./packaging/irods-runtime.list fi elif [ "$SERVER_TYPE" == "RESOURCE" ] ; then - $EPMCMD $EPMOPTS -a $arch -f deb irods-resource $epmvar=true ./packaging/irods.list + $EPMCMD $EPMOPTS -a $arch -f deb irods-resource $epmvar=true UBUNTU12=$UBUNTU12 ./packaging/irods.list fi if [ "$FAST" == "0" ] && [ "$SERVER_TYPE" == "ICOMMANDS" -o "$RELEASE" == "1" ] ; then $EPMCMD $EPMOPTS -a $arch -f deb irods-icommands $epmvar=true ./packaging/irods-icommands.list diff --git a/packaging/irods.list.template b/packaging/irods.list.template index ede5f94a08..9a3e85aec0 100644 --- a/packaging/irods.list.template +++ b/packaging/irods.list.template @@ -107,14 +107,15 @@ $RESOURCE=true %requires openssl %requires python-psutil %requires python-requests -%requires python-jsonschema %endif %format all - - +%if UBUNTU12 +%else +%requires python-jsonschema +%endif