Updating to SpringBoot 2.1.3 and SpringCloud Greenwich.SR1

Also allowing Gateway configuration parameters to be read from
staMailet.properties file.

Author: gm2552

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>gateway</artifactId>    
     <name>Direct Project Agent Gateways.</name>
-    <version>6.1-SNAPSHOT</version>
+    <version>6.0.2-SNAPSHOT</version>
     <description>Direct Project security agent gateways and bridges.</description>
     <inceptionYear>2010</inceptionYear>
     <url>https://github.com/DirectProjectJavaRI/gateway</url>        
@@ -28,7 +28,7 @@
    <parent>
 	   <groupId>org.springframework.boot</groupId>
 	   <artifactId>spring-boot-dependencies</artifactId>
-	   <version>2.1.2.RELEASE</version>
+	   <version>2.1.3.RELEASE</version>
    </parent>    
   <scm>
      <url>https://nhin-d.googlecode.com/hg/java/gateway/</url>  
@@ -45,14 +45,14 @@
 		  <dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.1.2.RELEASE</version>
+				<version>2.1.3.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 		  </dependency>		
 		  <dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-parent</artifactId>
-				<version>Greenwich.RELEASE</version>
+				<version>Greenwich.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 		  </dependency>  
@@ -62,32 +62,32 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>agent</artifactId>
-	        <version>6.0.1</version>
+	        <version>6.0.3-SNAPSHOT</version>
 	    </dependency> 
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>direct-common</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.1-SNAPSHOT</version>
 	    </dependency> 	
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>direct-common-audit</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.1-SNAPSHOT</version>
 	    </dependency> 	        
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>config-service-client</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.1-SNAPSHOT</version>
 	    </dependency>	
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>direct-msg-monitor-client</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.1-SNAPSHOT</version>
 	    </dependency>	
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>xd-common</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.1-SNAPSHOT</version>
 	        <exclusions>
 	           <exclusion>
 	              <groupId>org.springframework.boot</groupId>
@@ -103,7 +103,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>agent</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.3-SNAPSHOT</version>
 	         <type>test-jar</type>
 	        <scope>test</scope>
 	    </dependency>      
@@ -156,7 +156,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>config-service-jar</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.2-SNAPSHOT</version>
 	        <scope>test</scope>	        
 	    </dependency>							
 	    <dependency>

src/main/java/org/nhindirect/gateway/GatewayConfiguration.java

@@ -24,6 +24,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.apache.mailet.Mailet;
 import org.nhindirect.common.options.OptionsManager;
 import org.nhindirect.common.options.OptionsParameter;
+import org.springframework.context.ApplicationContext;
 /**
  * Utility class for retrieving parameterized configuration options.  Options for the can be configured in one of two ways: 
  * either by setting appropriate option as an XML element in a mailet's XML configuration (optional and typically found in the config.xml file
@@ -47,10 +48,21 @@ public class GatewayConfiguration
      * @param mailet The mailet to search.  May be null
      * @return If found, returns, the value of the configured value.  Otherwise, the default value is returned
      */
-    public static final String getConfigurationParam(String param, Mailet mailet, String defaultValue)
+    public static final String getConfigurationParam(String param, Mailet mailet, ApplicationContext ctx, String defaultValue)
     {
 		// get from the mailet init parameter first
 		String paramValue = (mailet == null) ? null : mailet.getMailetConfig().getInitParameter(param);
+		
+		if (paramValue == null || paramValue.isEmpty() && ctx != null)
+		{
+			// try the application context
+			try
+			{
+				paramValue = ctx.getEnvironment().getProperty(param);
+			}
+			catch (Exception e) {/* no-op */}
+		}
+		
 		if (paramValue == null || paramValue.isEmpty())
 		{
 			// if not in the mailet config, then try the 
@@ -69,9 +81,9 @@ public static final String getConfigurationParam(String param, Mailet mailet, St
      * @param mailet The mailet to search.  May be null
      * @return If found, returns, the value of the configured value.  Otherwise, the default value is returned.
      */
-    public static final boolean getConfigurationParamAsBoolean(String param, Mailet mailet, boolean defaultValue)
+    public static final boolean getConfigurationParamAsBoolean(String param, Mailet mailet, ApplicationContext ctx, boolean defaultValue)
     {
-    	final String paramValue = getConfigurationParam(param, mailet, "");
+    	final String paramValue = getConfigurationParam(param, mailet, ctx, "");
 
 		// get from the mailet init parameter first
 		return (paramValue.isEmpty()) ? defaultValue : Boolean.parseBoolean(paramValue);