Merge branch 'master' into travis-build

.gitignore

@@ -24,15 +24,10 @@ 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
+iRODS/lib/core/include/rodsVersion.h
 iRODS/lib/core/src/rodsLog.cpp
 iRODS/server/config/server.config
 iRODS/server/config/lockFileDir/.gitignore

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`.
 
 
 <table border="1">

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"
 

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 \<linux/types.h\>\x0a\#endif"
 
@@ -54,14 +53,20 @@ 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)
+	$(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)..."; \
+			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); \
@@ -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) *
-	@cp $(IRODSEXTERNALARCHIVE) $(IRODSEXTERNALLOCAL)
-	@touch $(FAKETARGETFORMAKE)
+	$(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
@@ -321,4 +320,3 @@ clean :
 	@echo "Cleaning $(IRODSEXTERNALARCHIVE)"
 	@rm -f $(IRODSEXTERNALARCHIVE)
 	@rm -f $(IRODSEXTERNALLOCAL)
-	@rm -f ${FAKETARGETFORMAKE}

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..."

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"

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
 
 
 

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

iRODS/clients/fuse/include/iFuseOper.hpp

@@ -6,8 +6,8 @@
 #define I_FUSE_OPER_HPP_
 
 #include <sys/statvfs.h>
-#include "rodsClient.hpp"
-#include "rodsPath.hpp"
+#include "rodsClient.h"
+#include "rodsPath.h"
 #include "iFuseLib.hpp"
 #include "iFuseLib.Lock.hpp"
 

iRODS/clients/fuse/include/irodsFs.hpp

@@ -18,9 +18,9 @@
 #define FUSE_USE_VERSION 26
 
 #include <fuse.h>
-#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

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; */

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();
 

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 */
 
@@ -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" );

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:

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)
 

iRODS/clients/icommands/src/genOSAuth.cpp

@@ -8,7 +8,8 @@
 #include <sys/stat.h>
 #include <vector>
 
-#include "rodsClient.hpp"
+#include "rodsClient.h"
+#include "osauth.h"
 
 
 int

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"

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 <string>

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();
 

iRODS/clients/icommands/src/icd.cpp

@@ -1,14 +1,13 @@
 /*** Copyright (c), The Regents of the University of California            ***
  *** For more information please refer to files in the COPYRIGHT directory ***/
 #include <fcntl.h>
-#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 "apiHandler.hpp"
-#include "rodsClient.hpp"
+#include "rodsClient.h"
 #include "irods_client_api_table.hpp"
 #include "irods_pack_table.hpp"
 

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"

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"
 

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"

iRODS/clients/icommands/src/idbug.cpp

@@ -3,7 +3,7 @@
 /* idbug.c - debug rule execution with single stepping across micro-services */
 
 #include <errno.h>
-#include "rodsClient.hpp"
+#include "rodsClient.h"
 #include <signal.h>
 
 

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();