#1 deploy 4.0.2.4 release

DICE-UNC · Nov 19, 2015 · 93bf907 · 93bf907
1 parent 6a8f6f8
commit 93bf907
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,8 @@
 
-Jargon Core API
-
-
 # Project: Jargon-core API
-#### Date: 11/09/2015
-#### Release Version: 4.0.2.4-RC1
-#### git tag: 4.0.2.4-RC1
+#### Date: 11/19/2015
+#### Release Version: 4.0.2.4-RELEASE
+#### git tag: 4.0.2.4-RELEASE
 #### Developer: Mike Conway - DICE
 
 ## News
@@ -100,7 +97,6 @@ Added a jargon.properties setting to turn off SSL cert chain checking by using a
 
 Fixes for SSL protocol selection to address some SSL/PAM handshake issues.  In addition, JDK1.8 is favored on most platforms to support later versions of TLS.
 
-
 ### Misc
 
 Lots of small fixes, pull requests, iRODS compatability tests and fixes through work with consortium
diff --git a/jargon-core/pom.xml b/jargon-core/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-		<version>4.0.2.4-SNAPSHOT</version>
+		<version>4.0.2.4-RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.irods.jargon</groupId>

diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/IRODSRegistrationOfFilesAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/IRODSRegistrationOfFilesAOImplTest.java
@@ -12,6 +12,7 @@
 import org.irods.jargon.core.exception.CollectionNotEmptyException;
 import org.irods.jargon.core.exception.DataNotFoundException;
 import org.irods.jargon.core.exception.DuplicateDataException;
+import org.irods.jargon.core.exception.FileNotFoundException;
 import org.irods.jargon.core.exception.JargonException;
 import org.irods.jargon.core.pub.domain.DataObject;
 import org.irods.jargon.core.pub.io.IRODSFile;
@@ -47,12 +48,12 @@ public static void setUpBeforeClass() throws Exception {
 		scratchFileUtils = new org.irods.jargon.testutils.filemanip.ScratchFileUtils(
 				testingProperties);
 		scratchFileUtils
-		.clearAndReinitializeScratchDirectory(IRODS_TEST_SUBDIR_PATH);
+				.clearAndReinitializeScratchDirectory(IRODS_TEST_SUBDIR_PATH);
 		irodsTestSetupUtilities = new org.irods.jargon.testutils.IRODSTestSetupUtilities();
 		irodsTestSetupUtilities.clearIrodsScratchDirectory();
 		irodsTestSetupUtilities.initializeIrodsScratchDirectory();
 		irodsTestSetupUtilities
-		.initializeDirectoryForTest(IRODS_TEST_SUBDIR_PATH);
+				.initializeDirectoryForTest(IRODS_TEST_SUBDIR_PATH);
 		assertionHelper = new org.irods.jargon.testutils.AssertionHelper();
 	}
 
@@ -66,7 +67,7 @@ public final void testIRODSRegistrationOfFilesAOImpl() throws Exception {
 		IRODSAccount irodsAccount = testingPropertiesHelper
 				.buildIRODSAccountFromTestProperties(testingProperties);
 		irodsFileSystem.getIRODSAccessObjectFactory()
-		.getIRODSRegistrationOfFilesAO(irodsAccount);
+				.getIRODSRegistrationOfFilesAO(irodsAccount);
 	}
 
 	@Test
@@ -75,7 +76,7 @@ public final void testRegisterPhysicalCollectionRecursivelyToIRODS()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			return;
 		}
@@ -93,10 +94,10 @@ public final void testRegisterPhysicalCollectionRecursivelyToIRODS()
 						testingProperties, IRODS_TEST_SUBDIR_PATH);
 
 		FileGenerator
-		.generateManyFilesAndCollectionsInParentCollectionByAbsolutePath(
-				localCollectionAbsolutePath,
-				"testPutCollectionWithTwoFiles", 1, 1, 1, "testFile",
-				".txt", 2, 2, 1, 2);
+				.generateManyFilesAndCollectionsInParentCollectionByAbsolutePath(
+						localCollectionAbsolutePath,
+						"testPutCollectionWithTwoFiles", 1, 1, 1, "testFile",
+						".txt", 2, 2, 1, 2);
 
 		IRODSRegistrationOfFilesAO ao = irodsFileSystem
 				.getIRODSAccessObjectFactory().getIRODSRegistrationOfFilesAO(
@@ -107,13 +108,13 @@ public final void testRegisterPhysicalCollectionRecursivelyToIRODS()
 				targetIrodsCollection,
 				false,
 				testingProperties
-				.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
+						.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
 				"");
 
 		IRODSFile parentFile = irodsFileSystem
 				.getIRODSFileFactory(irodsAccount).instanceIRODSFile(
 						targetIrodsCollection
-						+ "/testPutCollectionWithTwoFileslvl1nbr0");
+								+ "/testPutCollectionWithTwoFileslvl1nbr0");
 		Assert.assertTrue("irodsCollection does not exist", parentFile.exists());
 
 	}
@@ -123,7 +124,7 @@ public final void testRegisterPhysicalDataFileToIRODS() throws Exception {
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			return;
 		}
@@ -165,7 +166,7 @@ public final void testRegisterPhysicalDataFileToIRODSTwiceNoForce()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			throw new DuplicateDataException(
 					"throw to get expected while skipping");
@@ -208,7 +209,7 @@ public final void testRegisterPhysicalDataFileToIRODSWhenCollection()
 			throws Exception {
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			throw new JargonException("throw to honor expected error");
 
@@ -240,7 +241,7 @@ public final void testRegisterPhysicalDataFileToIRODSWhenResourceIsBlank()
 			throws Exception {
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 
 			throw new IllegalArgumentException(
@@ -278,7 +279,7 @@ public final void testRegisterPhysicalDataFileToIRODSLocalFileMissing()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 
 			throw new DataNotFoundException(
@@ -302,7 +303,7 @@ public final void testRegisterPhysicalDataFileToIRODSLocalFileMissing()
 				absPath + "/" + testFileName,
 				targetIrodsCollection + "/" + testFileName,
 				testingProperties
-				.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
+						.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
 				"", false);
 	}
 
@@ -311,13 +312,13 @@ public final void testRegisterPhysicalDataFileToIRODSLocalFileMissing()
 	 *
 	 * @throws Exception
 	 */
-	@Test(expected = DataNotFoundException.class)
+	@Test(expected = FileNotFoundException.class)
 	public final void testRegisterPhysicalDataFileToIRODSIRODSParentMissing()
 			throws Exception {
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			throw new DataNotFoundException("honor expected");
 		}
@@ -338,7 +339,7 @@ public final void testRegisterPhysicalDataFileToIRODSIRODSParentMissing()
 				.buildIRODSCollectionAbsolutePathFromTestProperties(
 						testingProperties,
 						IRODS_TEST_SUBDIR_PATH
-						+ "/testRegisterPhysicalDataFileToIRODSIRODSParentMissing");
+								+ "/testRegisterPhysicalDataFileToIRODSIRODSParentMissing");
 
 		ao.registerPhysicalDataFileToIRODS(fileNameOrig, targetIrodsCollection
 				+ "/" + testFileName, testingProperties
@@ -357,7 +358,7 @@ public final void testRegisterPhysicalDataFileToIRODSRegisterChecksum()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			return;
 		}
@@ -414,7 +415,7 @@ public final void testRegisterPhysicalDataFileToIRODSWithVerifyLocalChecksum()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			return;
 		}
@@ -452,7 +453,7 @@ public final void testRegisterPhysicalDataFileToIRODSWithVerifyLocalChecksum()
 						fileNameOrig,
 						targetIrodsCollection + "/" + testFileName,
 						testingProperties
-						.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
+								.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
 						"");
 
 		assertionHelper.assertIrodsFileOrCollectionExists(targetIrodsCollection
@@ -476,7 +477,7 @@ public final void testUnregisterButDoNotDeletePhysicalFile()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			return;
 		}
@@ -562,7 +563,7 @@ public final void testRegisterPhysicalDataFileToIRODSAsAReplica()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			return;
 		}
@@ -595,7 +596,7 @@ public final void testRegisterPhysicalDataFileToIRODSAsAReplica()
 				fileNameOrig,
 				targetIrodsCollection + "/" + testFileName,
 				testingProperties
-				.getProperty(TestingPropertiesHelper.IRODS_SECONDARY_RESOURCE_KEY),
+						.getProperty(TestingPropertiesHelper.IRODS_SECONDARY_RESOURCE_KEY),
 				"", false);
 
 		assertionHelper.assertIrodsFileOrCollectionExists(targetIrodsCollection
@@ -638,7 +639,7 @@ public final void testRegisterPhysicalDataFileToIRODSAsAReplicaWhenFileDoesNotYe
 				fileNameOrig,
 				targetIrodsCollection + "/" + testFileName,
 				testingProperties
-				.getProperty(TestingPropertiesHelper.IRODS_SECONDARY_RESOURCE_KEY),
+						.getProperty(TestingPropertiesHelper.IRODS_SECONDARY_RESOURCE_KEY),
 				"", false);
 
 		assertionHelper.assertIrodsFileOrCollectionExists(targetIrodsCollection
@@ -657,7 +658,7 @@ public final void testUnregisterPhysicalCollectionRecursively()
 
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			return;
 		}
@@ -678,10 +679,10 @@ public final void testUnregisterPhysicalCollectionRecursively()
 		targetIrodsFile.deleteWithForceOption();
 
 		FileGenerator
-		.generateManyFilesAndCollectionsInParentCollectionByAbsolutePath(
-				localCollectionAbsolutePath,
-				"testPutCollectionWithTwoFiles", 4, 7, 1, "testFile",
-				".txt", 2, 2, 1, 2);
+				.generateManyFilesAndCollectionsInParentCollectionByAbsolutePath(
+						localCollectionAbsolutePath,
+						"testPutCollectionWithTwoFiles", 4, 7, 1, "testFile",
+						".txt", 2, 2, 1, 2);
 
 		IRODSRegistrationOfFilesAO ao = irodsFileSystem
 				.getIRODSAccessObjectFactory().getIRODSRegistrationOfFilesAO(
@@ -692,15 +693,15 @@ public final void testUnregisterPhysicalCollectionRecursively()
 				targetIrodsCollection,
 				false,
 				testingProperties
-				.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
+						.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
 				"");
 
 		ao.unregisterCollection(targetIrodsCollection, true);
 
 		IRODSFile parentFile = irodsFileSystem
 				.getIRODSFileFactory(irodsAccount).instanceIRODSFile(
 						targetIrodsCollection
-						+ "/testPutCollectionWithTwoFileslvl1nbr0");
+								+ "/testPutCollectionWithTwoFileslvl1nbr0");
 		Assert.assertFalse("irodsCollection should not exist",
 				parentFile.exists());
 
@@ -716,7 +717,7 @@ public final void testUnregisterPhysicalCollectionNoRecursive()
 			throws Exception {
 		if (testingPropertiesHelper.isTestRegistration(testingProperties)
 				&& testingPropertiesHelper
-				.isTestFileSystemMountLocal(testingProperties)) {
+						.isTestFileSystemMountLocal(testingProperties)) {
 		} else {
 			throw new CollectionNotEmptyException("throwing to match expected");
 		}
@@ -738,10 +739,10 @@ public final void testUnregisterPhysicalCollectionNoRecursive()
 		targetIrodsFile.deleteWithForceOption();
 
 		FileGenerator
-		.generateManyFilesAndCollectionsInParentCollectionByAbsolutePath(
-				localCollectionAbsolutePath,
-				"testPutCollectionWithTwoFiles", 1, 1, 1, "testFile",
-				".txt", 2, 2, 1, 2);
+				.generateManyFilesAndCollectionsInParentCollectionByAbsolutePath(
+						localCollectionAbsolutePath,
+						"testPutCollectionWithTwoFiles", 1, 1, 1, "testFile",
+						".txt", 2, 2, 1, 2);
 
 		IRODSRegistrationOfFilesAO ao = irodsFileSystem
 				.getIRODSAccessObjectFactory().getIRODSRegistrationOfFilesAO(
@@ -752,15 +753,15 @@ public final void testUnregisterPhysicalCollectionNoRecursive()
 				targetIrodsCollection,
 				false,
 				testingProperties
-				.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
+						.getProperty(TestingPropertiesHelper.IRODS_RESOURCE_KEY),
 				"");
 
 		ao.unregisterCollection(targetIrodsCollection, false);
 
 		IRODSFile parentFile = irodsFileSystem
 				.getIRODSFileFactory(irodsAccount).instanceIRODSFile(
 						targetIrodsCollection
-						+ "/testPutCollectionWithTwoFileslvl1nbr0");
+								+ "/testPutCollectionWithTwoFileslvl1nbr0");
 		Assert.assertFalse("irodsCollection should not exist",
 				parentFile.exists());
 

diff --git a/jargon-data-utils/pom.xml b/jargon-data-utils/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-		<version>4.0.2.4-SNAPSHOT</version>
+		<version>4.0.2.4-RELEASE</version>
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-data-utils</artifactId>

diff --git a/jargon-httpstream/pom.xml b/jargon-httpstream/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>jargon</artifactId>
     <groupId>org.irods</groupId>
-	<version>4.0.2.4-SNAPSHOT</version>
+	<version>4.0.2.4-RELEASE</version>
   </parent>
   <groupId>org.irods.jargon</groupId>
   <artifactId>jargon-httpstream</artifactId> 

diff --git a/jargon-ruleservice/pom.xml b/jargon-ruleservice/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-		<version>4.0.2.4-SNAPSHOT</version>
+		<version>4.0.2.4-RELEASE</version>
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-ruleservice</artifactId>

diff --git a/jargon-ticket/pom.xml b/jargon-ticket/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-		<version>4.0.2.4-SNAPSHOT</version>
+		<version>4.0.2.4-RELEASE</version>
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-ticket</artifactId>

diff --git a/jargon-user-profile/pom.xml b/jargon-user-profile/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>jargon</artifactId>
     <groupId>org.irods</groupId>
-	<version>4.0.2.4-SNAPSHOT</version>
+	<version>4.0.2.4-RELEASE</version>
   </parent>
   <groupId>org.irods.jargon</groupId>
   <artifactId>jargon-user-profile</artifactId>

diff --git a/jargon-user-tagging/pom.xml b/jargon-user-tagging/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.irods</groupId>
     <artifactId>jargon</artifactId>
-	<version>4.0.2.4-SNAPSHOT</version>
+	<version>4.0.2.4-RELEASE</version>
   </parent>
   <modelVersion>4.0.0</modelVersion> 
   <groupId>org.irods.jargon</groupId>

diff --git a/jargon-workflow/pom.xml b/jargon-workflow/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>jargon</artifactId>
 		<groupId>org.irods</groupId>
-		<version>4.0.2.4-SNAPSHOT</version>
+		<version>4.0.2.4-RELEASE</version>
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-workflow</artifactId>