Merge pull request #30 from DirectProjectJavaRI/develop

Releasing 8.1.2

Author: gm2552

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nhind</groupId>
 	<artifactId>config-service-jar</artifactId>
-	<version>8.1.1</version>
+	<version>8.1.2</version>
 	<packaging>jar</packaging>
 	<name>NHIN Direct Java RI config service jar</name>
     <description>NHIN Direct Java RI config service jar.</description>	
@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>org.nhind</groupId>
 			<artifactId>direct-common</artifactId>
-			<version>8.1.0</version>	
+			<version>8.1.2</version>	
 		</dependency>											  
 	      <dependency>
 			<groupId>commons-net</groupId>
@@ -162,7 +162,8 @@
 	                </goals>
 	              </execution>
 	            </executions>					
-			</plugin>				
+			</plugin>	
+			<!-- for releases only			
 	        <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-gpg-plugin</artifactId>
@@ -176,7 +177,8 @@
                  </execution>
                </executions>
                <version>3.0.1</version>
-            </plugin>		
+            </plugin>	
+            -->	
 	        <plugin>
 	          <groupId>org.sonatype.central</groupId>
 	          <artifactId>central-publishing-maven-plugin</artifactId>

src/main/java/org/nhindirect/config/springconfig/KeyStoreConfig.java

@@ -49,6 +49,19 @@ public KeyStoreProtectionManager hsmKeyStoreProtectionManager()
 	  {
 		  log.info("HSM configured.  Attempting to connect to device.");
 
+		  // Special case for String "null" so the source string can be set to null if needed
+		  if (keyStoreSourceAsString.equalsIgnoreCase("null"))
+			  keyStoreSourceAsString = null;
+		  
+		  StringBuilder builder = new StringBuilder("HSM configuration details: \r\n");
+		  builder.append("\tkeyStoreType: ").append(keyStoreType).append("\r\n");
+		  builder.append("\tkeyStoreSourceAsString: ").append(keyStoreSourceAsString).append("\r\n");
+		  builder.append("\tkeyStoreProviderName: ").append(keyStoreProviderName).append("\r\n");
+		  builder.append("\tkeyStorePassPhraseAlias: ").append(keyStorePassPhraseAlias).append("\r\n");
+		  builder.append("\tinitOnStart: ").append(initOnStart).append("\r\n");
+		  
+		  log.info(builder.toString());
+		  
 		  try
 		  {
 			  final BootstrappedPKCS11Credential cred = new BootstrappedPKCS11Credential(keyStorePin);