[#43] Replace jobs.irods.* properties with irods.admin.* properties

This commit removes the jobs.irods.* properties.

emc-metalnx-core/attic/TestCreateTicketWithGroupRestriction.java

@@ -39,7 +39,7 @@ public class TestCreateTicketWithGroupRestriction {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-core/attic/TestDownloadWithTicket.java

@@ -48,7 +48,7 @@ public class TestDownloadWithTicket {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-core/attic/TestTicketAuthenticatedAccess.java

@@ -56,10 +56,10 @@ public class TestTicketAuthenticatedAccess {
 	@Value("${irods.port}")
 	private String port;
 
-	@Value("${jobs.irods.username}")
+	@Value("${irods.admin.user}")
 	private String username;
 
-	@Value("${jobs.irods.password}")
+	@Value("${irods.admin.password}")
 	private String password;
 
 	@Autowired

emc-metalnx-core/attic/TestTicketWithGroupRestriction.java

@@ -40,7 +40,7 @@ public class TestTicketWithGroupRestriction {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-core/attic/TestUploadWithTicket.java

@@ -42,7 +42,7 @@ public class TestUploadWithTicket {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-core/pom.xml

@@ -247,12 +247,6 @@
 
 									######################################
 
-									jobs.irods.username=${jargon.test.irods.admin}
-									jobs.irods.password=${jargon.test.irods.admin.password}
-									jobs.irods.auth.scheme=${metalnx.auth.scheme}
-									runSyncJobs=true
-
-
 									rmd.connection.timeout=500
 									rmd.connection.port=8000
 

emc-metalnx-services/pom.xml

@@ -244,12 +244,6 @@
 
 									######################################
 
-									jobs.irods.username=${jargon.test.irods.admin}
-									jobs.irods.password=${jargon.test.irods.admin.password}
-									jobs.irods.auth.scheme=${metalnx.auth.scheme}
-									runSyncJobs=true
-
-
 									rmd.connection.timeout=500
 									rmd.connection.port=8000
 

emc-metalnx-services/src/main/java/com/emc/metalnx/context/EncodedPropertiesConfigurer.java

@@ -22,7 +22,7 @@
 public class EncodedPropertiesConfigurer extends PropertyPlaceholderConfigurer {
 
     private static final String PROPERTIES_TO_BE_DECODED = "encoded.properties";
-    private static final String DEFAULT_ENCODED_FIELDS = "db.password,jobs.irods.password";
+    private static final String DEFAULT_ENCODED_FIELDS = "db.password,irods.admin.password";
     private static final String PWD_SALT = "!M3t4Lnx@1234";
 
     private static final Logger logger = LoggerFactory.getLogger(EncodedPropertiesConfigurer.class);

emc-metalnx-services/src/main/java/com/emc/metalnx/services/configuration/ConfigServiceImpl.java

@@ -51,13 +51,13 @@ public class ConfigServiceImpl implements ConfigService {
 	@Value("${irods.zoneName}")
 	private String irodsZone;
 
-	@Value("${jobs.irods.username}")
-	private String irodsJobUser;
+	@Value("${irods.admin.user}")
+	private String irodsAdminUser;
 
-	@Value("${jobs.irods.password}")
-	private String irodsJobPassword;
+	@Value("${irods.admin.password}")
+	private String irodsAdminPassword;
 
-	@Value("${jobs.irods.auth.scheme}")
+	@Value("${irods.auth.scheme}")
 	private String irodsAuthScheme;
 
 	@Value("${populate.msi.enabled}")
@@ -189,13 +189,13 @@ public String getIrodsZone() {
 	}
 
 	@Override
-	public String getIrodsJobUser() {
-		return irodsJobUser;
+	public String getIrodsAdminUser() {
+		return irodsAdminUser;
 	}
 
 	@Override
-	public String getIrodsJobPassword() {
-		return irodsJobPassword;
+	public String getIrodsAdminPassword() {
+		return irodsAdminPassword;
 	}
 
 	@Override
@@ -367,8 +367,8 @@ public String toString() {
 		if (irodsZone != null) {
 			builder.append("irodsZone=").append(irodsZone).append(", ");
 		}
-		if (irodsJobUser != null) {
-			builder.append("irodsJobUser=").append(irodsJobUser).append(", ");
+		if (irodsAdminUser != null) {
+			builder.append("irodsAdminUser=").append(irodsAdminUser).append(", ");
 		}
 		if (irodsAuthScheme != null) {
 			builder.append("irodsAuthScheme=").append(irodsAuthScheme).append(", ");
@@ -439,13 +439,13 @@ public void setIrodsZone(String irodsZone) {
 	}
 
 	@Override
-	public void setIrodsJobUser(String irodsJobUser) {
-		this.irodsJobUser = irodsJobUser;
+	public void setIrodsAdminUser(String irodsAdminUser) {
+		this.irodsAdminUser = irodsAdminUser;
 	}
 
 	@Override
-	public void setIrodsJobPassword(String irodsJobPassword) {
-		this.irodsJobPassword = irodsJobPassword;
+	public void setIrodsAdminPassword(String irodsAdminPassword) {
+		this.irodsAdminPassword = irodsAdminPassword;
 	}
 
 	@Override

emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/AdminServicesImpl.java

@@ -102,8 +102,8 @@ private void authenticateIRODSAccount() throws JargonException {
 		String host = configService.getIrodsHost();
 		int port = Integer.parseInt(configService.getIrodsPort());
 		String zone = configService.getIrodsZone();
-		String user = configService.getIrodsJobUser();
-		String password = configService.getIrodsJobPassword();
+		String user = configService.getIrodsAdminUser();
+		String password = configService.getIrodsAdminPassword();
 		String authScheme = configService.getIrodsAuthScheme();
 		String resc = "";
 		String homeDir = "";

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestAddDataGridMetadataListToColls.java

@@ -39,7 +39,7 @@ public class TestAddDataGridMetadataListToColls {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestAddDataGridMetadataListToObjs.java

@@ -39,7 +39,7 @@ public class TestAddDataGridMetadataListToObjs {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestAddDataGridMetadataToColls.java

@@ -37,7 +37,7 @@ public class TestAddDataGridMetadataToColls {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+	@Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestAddDataGridMetadataToObjs.java

@@ -39,7 +39,7 @@ public class TestAddDataGridMetadataToObjs {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+	@Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestAddMetadataToColls.java

@@ -39,7 +39,7 @@ public class TestAddMetadataToColls {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+	@Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestAddMetadataToObjs.java

@@ -42,7 +42,7 @@ public class TestAddMetadataToObjs {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestCopyCollWithMetadata.java

@@ -39,7 +39,7 @@ public class TestCopyCollWithMetadata {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestCopyObjWithMetadata.java

@@ -42,7 +42,7 @@ public class TestCopyObjWithMetadata {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+	@Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/metadata/TestMetadataCase.java

@@ -61,7 +61,7 @@ public class TestMetadataCase {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+	@Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/permissions/TestMostRestrictivePermission.java

@@ -39,7 +39,7 @@ public class TestMostRestrictivePermission {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/permissions/TestReadPermissionOnFiles.java

@@ -40,7 +40,7 @@ public class TestReadPermissionOnFiles {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/ticketclient/TestTicketWithByteLimit.java

@@ -40,7 +40,7 @@ public class TestTicketWithByteLimit {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/ticketclient/TestTicketWithExpirationDate.java

@@ -42,7 +42,7 @@ public class TestTicketWithExpirationDate {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/ticketclient/TestTicketWithFilesLimit.java

@@ -40,7 +40,7 @@ public class TestTicketWithFilesLimit {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/ticketclient/TestTicketWithHostRestriction.java

@@ -38,7 +38,7 @@ public class TestTicketWithHostRestriction {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Value("${irods.host}")

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/ticketclient/TestTicketWithUserRestriction.java

@@ -38,7 +38,7 @@ public class TestTicketWithUserRestriction {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/ticketclient/TestTicketWithUsesLimit.java

@@ -41,7 +41,7 @@ public class TestTicketWithUsesLimit {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateDuplicatedTicket.java

@@ -33,7 +33,7 @@ public class TestCreateDuplicatedTicket {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateTicket.java

@@ -34,7 +34,7 @@ public class TestCreateTicket {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateTicketWithByteLimit.java

@@ -39,7 +39,7 @@ public class TestCreateTicketWithByteLimit {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateTicketWithExpirationDate.java

@@ -41,7 +41,7 @@ public class TestCreateTicketWithExpirationDate {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateTicketWithFilesLimit.java

@@ -39,7 +39,7 @@ public class TestCreateTicketWithFilesLimit {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateTicketWithHostRestriction.java

@@ -36,7 +36,7 @@ public class TestCreateTicketWithHostRestriction {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Value("${irods.host}")

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateTicketWithUserRestriction.java

@@ -37,7 +37,7 @@ public class TestCreateTicketWithUserRestriction {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestCreateTicketWithUsesLimit.java

@@ -39,7 +39,7 @@ public class TestCreateTicketWithUsesLimit {
     @Value("${irods.zoneName}")
     private String zone;
 
-    @Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
     private String username;
 
     @Autowired

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/tickets/TestDeleteTickets.java

@@ -39,7 +39,7 @@ public class TestDeleteTickets {
 	@Value("${irods.zoneName}")
 	private String zone;
 
-	@Value("${jobs.irods.username}")
+    @Value("${irods.admin.user}")
 	private String username;
 
 	@Autowired