Merge pull request #16 from DirectProjectJavaRI/develop

Releasing 8.1.2

Author: gm2552

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>gateway</artifactId>    
     <name>Direct Project Agent Gateways.</name>
-    <version>8.1.0</version>
+    <version>8.1.2</version>
     <description>Direct Project security agent gateways and bridges.</description>
     <inceptionYear>2010</inceptionYear>
     <url>https://github.com/DirectProjectJavaRI/gateway</url>        
@@ -68,7 +68,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>agent</artifactId>
-	        <version>8.1.0</version>
+	        <version>8.1.2</version>
 	    </dependency> 
 	    <dependency>
 	        <groupId>org.nhind</groupId>
@@ -129,7 +129,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>config-service-jar</artifactId>
-	        <version>8.1.0</version>
+	        <version>8.1.2</version>
 	        <scope>test</scope>	        
 	    </dependency>							
 	    <dependency>
@@ -289,8 +289,7 @@
 	              </goals>
 	            </execution>
 	        </executions>		        
-	      </plugin>
-		<!--  for release only	      
+	      </plugin> 
 	      <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-gpg-plugin</artifactId>
@@ -304,7 +303,6 @@
               </execution>
             </executions>
          </plugin>      
-          -->   
         <plugin>
           <groupId>org.sonatype.central</groupId>
           <artifactId>central-publishing-maven-plugin</artifactId>

src/main/java/org/nhindirect/gateway/springconfig/KeyStoreProtectionMgrConfig.java

@@ -50,6 +50,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);