[taverna-cvs] [taverna] r14116 committed - Improved logging messages.

[<ta...@go...>]

Revision: 14116
Author:   al...@my...
Date:     Fri Sep 23 08:55:53 2011
Log:      Improved logging messages.
http://code.google.com/p/taverna/source/detail?r=14116

Modified:
   
/taverna/engine/net.sf.taverna.t2.security/trunk/credential-manager-impl/src/main/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerImpl.java
   
/taverna/engine/net.sf.taverna.t2.security/trunk/credential-manager-impl/src/test/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerImplIT.java

=======================================
---  
/taverna/engine/net.sf.taverna.t2.security/trunk/credential-manager-impl/src/main/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerImpl.java	 
Fri Sep 16 08:19:09 2011
+++  
/taverna/engine/net.sf.taverna.t2.security/trunk/credential-manager-impl/src/main/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerImpl.java	 
Fri Sep 23 08:55:53 2011
@@ -302,7 +302,7 @@
  					masterPassword = null; // it is probably the wrong password
  											// so do not remember it just in
  											// case
-					String exMessage = "Failed to load Taverna's Keystore. Possible  
reason: incorrect password or corrupted file.";
+					String exMessage = "Failed to load Taverna's Keystore from " +  
keystoreFile.getAbsolutePath() + ". Possible reason: incorrect password or  
corrupted file.";
  					logger.error(exMessage, ex);
  					throw new CMException(exMessage, ex);
  				} finally {
@@ -401,7 +401,7 @@
  					masterPassword = null; // it is probably the wrong password
  											// so do not remember it just in
  											// case
-					String exMessage = "Failed to load Taverna's Truststore. Possible  
reason: incorrect password or corrupted file.";
+					String exMessage = "Failed to load Taverna's Truststore from " +  
truststoreFile.getAbsolutePath() + ". Possible reason: incorrect password  
or corrupted file.";
  					// logger.error(exMessage, ex);
  					throw new CMException(exMessage, ex);
  				} finally {
=======================================
---  
/taverna/engine/net.sf.taverna.t2.security/trunk/credential-manager-impl/src/test/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerImplIT.java	 
Thu Sep 22 05:33:59 2011
+++  
/taverna/engine/net.sf.taverna.t2.security/trunk/credential-manager-impl/src/test/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerImplIT.java	 
Fri Sep 23 08:55:53 2011
@@ -298,4 +298,42 @@
  		conn.disconnect();

  	}
-}
+
+	public void generateKeystores() throws Exception{
+
+		setUpBeforeCLass();
+
+		// The code below sets up the Keystore and Truststore files and loads  
some data into them
+		// and saves them into a temp directory. These files can later be used  
for testing the Credential
+		// Manager with non-empty keystores.
+		Random randomGenerator = new Random();
+		String credentialManagerDirectoryPath = System
+				.getProperty("java.io.tmpdir")
+				+ System.getProperty("file.separator")
+				+ "taverna-security-"
+				+ randomGenerator.nextInt(1000000);
+		System.out.println("Credential Manager's Keystore and Truststore will be  
saved to: "
+				+ credentialManagerDirectoryPath);
+		credentialManagerDirectory = new File(credentialManagerDirectoryPath);
+		 
credentialManager.setConfigurationDirectoryPath(credentialManagerDirectory);
+
+		// Create the dummy master password provider
+		masterPasswordProvider = new DummyMasterPasswordProvider();
+//		masterPasswordProvider.setMasterPassword(masterPassword);
+		masterPasswordProvider.setMasterPassword("uber");
+		List<MasterPasswordProvider> masterPasswordProviders = new  
ArrayList<MasterPasswordProvider>();
+		masterPasswordProviders.add(masterPasswordProvider);
+		credentialManager.setMasterPasswordProviders(masterPasswordProviders);
+
+		// Add some stuff into Credential Manager
+		credentialManager.addUsernameAndPasswordForService(usernamePassword, new  
URI("http://heater.cs.man.ac.uk:7070/axis/services/HelloService-PlaintextPassword?wsdl"));
+
+//		credentialManager.addUsernameAndPasswordForService(usernamePassword,  
serviceURI);
+//		credentialManager.addUsernameAndPasswordForService(usernamePassword2,  
serviceURI2);
+//		credentialManager.addUsernameAndPasswordForService(usernamePassword3,  
serviceURI3);
+//		credentialManager.addKeyPair(privateKey, privateKeyCertChain);
+		credentialManager.addTrustedCertificate(trustedCertficateHeater);
+	}
+
+
+}