Updating ability to read properties from app context.

Author: gm2552

src/main/java/org/nhindirect/gateway/smtp/dsn/impl/FailedDeliveryDSNCreator.java

@@ -77,25 +77,25 @@ public FailedDeliveryDSNCreator(Mailet mailet)
 		this.dsnStatus = DSNStatus.DELIVERY_OTHER;
 
 		generator = new DSNGenerator(GatewayConfiguration.getConfigurationParam(FailedDeliveryDSNCreatorOptions.DSN_FAILED_PREFIX, 
-				mailet, FailedDeliveryDSNCreatorOptions.DEFAULT_PREFIX));
+				mailet, null, FailedDeliveryDSNCreatorOptions.DEFAULT_PREFIX));
 
 		postmasterMailbox = GatewayConfiguration.getConfigurationParam(FailedDeliveryDSNCreatorOptions.DSN_POSTMASTER, 
-				mailet, FailedDeliveryDSNCreatorOptions.DEFAULT_POSTMASTER);
+				mailet, null, FailedDeliveryDSNCreatorOptions.DEFAULT_POSTMASTER);
 
 		reportingMta = GatewayConfiguration.getConfigurationParam(FailedDeliveryDSNCreatorOptions.DSN_MTA_NAME, 
-				mailet, FailedDeliveryDSNCreatorOptions.DEFAULT_MTA_NAME);
+				mailet, null, FailedDeliveryDSNCreatorOptions.DEFAULT_MTA_NAME);
 
 
 		textGenerator = new DefaultDSNFailureTextBodyPartGenerator(
 				GatewayConfiguration.getConfigurationParam(FailedDeliveryDSNCreatorOptions.DSN_FAILED_HEADER, 
-						mailet, FailedDeliveryDSNCreatorOptions.DEFAULT_HEADER), 
+						mailet, null, FailedDeliveryDSNCreatorOptions.DEFAULT_HEADER), 
 						GatewayConfiguration.getConfigurationParam(FailedDeliveryDSNCreatorOptions.DSN_FAILED_FOOTER, 
-						mailet, FailedDeliveryDSNCreatorOptions.DEFAULT_FOOTER), 
+						mailet, null, FailedDeliveryDSNCreatorOptions.DEFAULT_FOOTER), 
 						GatewayConfiguration.getConfigurationParam(FailedDeliveryDSNCreatorOptions.DSN_FAILED_RECIP_TITLE, 
-						mailet, FailedDeliveryDSNCreatorOptions.DEFAULT_FAILED_RECIP_TITLE), 
+						mailet, null, FailedDeliveryDSNCreatorOptions.DEFAULT_FAILED_RECIP_TITLE), 
 						FailedDeliveryDSNCreatorOptions.DEFAULT_ERROR_MESSAGE_TITLE,
 					GatewayConfiguration.getConfigurationParam(FailedDeliveryDSNCreatorOptions.DSN_FAILED_ERROR_MESSAGE, 
-								mailet, FailedDeliveryDSNCreatorOptions.DEFAULT_ERROR_MESSAGE),
+								mailet, null, FailedDeliveryDSNCreatorOptions.DEFAULT_ERROR_MESSAGE),
 			    HumanReadableTextAssemblerFactory.getInstance());
 	}
 }

src/main/java/org/nhindirect/gateway/smtp/dsn/impl/RejectedRecipientDSNCreator.java

@@ -81,25 +81,25 @@ public RejectedRecipientDSNCreator(Mailet mailet)
 		this.dsnStatus = DSNStatus.UNDEFINED_STATUS;
 
 		generator = new DSNGenerator(GatewayConfiguration.getConfigurationParam(RejectedRecipientDSNCreatorOptions.DSN_FAILED_PREFIX, 
-				mailet, RejectedRecipientDSNCreatorOptions.DEFAULT_PREFIX));
+				mailet, null, RejectedRecipientDSNCreatorOptions.DEFAULT_PREFIX));
 
 		postmasterMailbox = GatewayConfiguration.getConfigurationParam(RejectedRecipientDSNCreatorOptions.DSN_POSTMASTER, 
-				mailet, RejectedRecipientDSNCreatorOptions.DEFAULT_POSTMASTER);
+				mailet, null, RejectedRecipientDSNCreatorOptions.DEFAULT_POSTMASTER);
 
 		reportingMta = GatewayConfiguration.getConfigurationParam(RejectedRecipientDSNCreatorOptions.DSN_MTA_NAME, 
-				mailet, RejectedRecipientDSNCreatorOptions.DEFAULT_MTA_NAME);
+				mailet, null, RejectedRecipientDSNCreatorOptions.DEFAULT_MTA_NAME);
 
 
 		textGenerator = new DefaultDSNFailureTextBodyPartGenerator(
 				GatewayConfiguration.getConfigurationParam(RejectedRecipientDSNCreatorOptions.DSN_FAILED_HEADER, 
-						mailet, RejectedRecipientDSNCreatorOptions.DEFAULT_HEADER), 
+						mailet, null, RejectedRecipientDSNCreatorOptions.DEFAULT_HEADER), 
 						GatewayConfiguration.getConfigurationParam(RejectedRecipientDSNCreatorOptions.DSN_FAILED_FOOTER, 
-						mailet, RejectedRecipientDSNCreatorOptions.DEFAULT_FOOTER), 
+						mailet, null, RejectedRecipientDSNCreatorOptions.DEFAULT_FOOTER), 
 						GatewayConfiguration.getConfigurationParam(RejectedRecipientDSNCreatorOptions.DSN_FAILED_RECIP_TITLE, 
-						mailet, RejectedRecipientDSNCreatorOptions.DEFAULT_FAILED_RECIP_TITLE), 
+						mailet, null, RejectedRecipientDSNCreatorOptions.DEFAULT_FAILED_RECIP_TITLE), 
 					RejectedRecipientDSNCreatorOptions.DEFAULT_ERROR_MESSAGE_TITLE,
 					GatewayConfiguration.getConfigurationParam(RejectedRecipientDSNCreatorOptions.DSN_FAILED_ERROR_MESSAGE, 
-								mailet, RejectedRecipientDSNCreatorOptions.DEFAULT_ERROR_MESSAGE),
+								mailet, null, RejectedRecipientDSNCreatorOptions.DEFAULT_ERROR_MESSAGE),
 			    HumanReadableTextAssemblerFactory.getInstance());
 	}
 

src/main/java/org/nhindirect/gateway/smtp/james/mailet/NHINDSecurityAndTrustMailet.java

@@ -113,7 +113,7 @@ public void init() throws MessagingException
 		try
 		{	
 			final boolean useOutboundPolicy = Boolean.parseBoolean(
-					GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.USE_OUTGOING_POLICY_FOR_INCOMING_NOTIFICATIONS, this, "false"));
+					GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.USE_OUTGOING_POLICY_FOR_INCOMING_NOTIFICATIONS, this, ctx, "false"));
 
 			// we don't know if this parameter came from the mailet config or the options manager, so just go ahead and set it at
 			// the options manager level because that it where the agent reads the value... no danger that we will overwrite the value that we want...
@@ -132,7 +132,7 @@ public void init() throws MessagingException
 		try
 		{
 			final boolean rejectOnTamperPolicy = Boolean.parseBoolean(
-					GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.REJECT_ON_ROUTING_TAMPER, this, "false"));
+					GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.REJECT_ON_ROUTING_TAMPER, this, ctx, "false"));
 
 			OptionsManager.getInstance().setOptionsParameter(
 					new OptionsParameter(OptionsParameter.REJECT_ON_ROUTING_TAMPER, Boolean.toString(rejectOnTamperPolicy)));
@@ -143,12 +143,12 @@ public void init() throws MessagingException
 		}
 
 		// set the JCE providers if available
-		final String JCEName = GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.JCE_PROVIDER_NAME, this, "");
+		final String JCEName = GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.JCE_PROVIDER_NAME, this, ctx, "");
 		if (!StringUtils.isEmpty(JCEName))
 			OptionsManager.getInstance().setOptionsParameter(
 					new OptionsParameter(OptionsParameter.JCE_PROVIDER, JCEName));
 
-		final String sensitiveJCEName = GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.JCE_SENTITIVE_PROVIDER, this, "");
+		final String sensitiveJCEName = GatewayConfiguration.getConfigurationParam(SecurityAndTrustMailetOptions.JCE_SENTITIVE_PROVIDER, this, ctx, "");
 		if (!StringUtils.isEmpty(sensitiveJCEName))
 			OptionsManager.getInstance().setOptionsParameter(
 					new OptionsParameter(OptionsParameter.JCE_SENTITIVE_PROVIDER, sensitiveJCEName));					

src/main/java/org/nhindirect/gateway/smtp/james/mailet/NotificationSuppressor.java

@@ -85,7 +85,7 @@ public void init() throws MessagingException
 		// get the consume processed MDN message setting
 		// default is false
 		consumeMDNProcessed = GatewayConfiguration.getConfigurationParamAsBoolean(SecurityAndTrustMailetOptions.CONSUME_MND_PROCESSED_PARAM,
-				this, false);
+				this, ctx, false);
 
 
 		LOGGER.info("NotificationSupressor initialization complete.");

src/main/java/org/nhindirect/gateway/smtp/james/mailet/TimelyAndReliableLocalDelivery.java

@@ -118,7 +118,7 @@ public void init() throws MessagingException
 		try
 		{
 			final String sDispatchedDelay =  GatewayConfiguration.getConfigurationParam(DISPATCHED_MDN_DELAY,
-					this, "0"); 
+					this, ctx, "0"); 
 
 			try
 			{