Author: indika
Date: Tue Jul 8 03:26:05 2008
New Revision: 674759
URL: http://svn.apache.org/viewvc?rev=674759&view=rev
Log:
minor chnages - logs
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/ICACertsLoader.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/IKeyStoreLoader.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/FileBaseSecretRepository.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/ICACertsLoader.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/ICACertsLoader.java?rev=674759&r1=674758&r2=674759&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/ICACertsLoader.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/ICACertsLoader.java
Tue Jul 8 03:26:05 2008
@@ -3,7 +3,7 @@
import java.security.KeyStore;
/**
- * ICACertsLoader provides an uniform interface to create a keystore
containing CA certs
+ * ICACertsLoader provides an uniform interface to create a keyStore
containing CA certs
* (truststore)
*/
public interface ICACertsLoader {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/IKeyStoreLoader.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/IKeyStoreLoader.java?rev=674759&r1=674758&r2=674759&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/IKeyStoreLoader.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/interfaces/IKeyStoreLoader.java
Tue Jul 8 03:26:05 2008
@@ -2,6 +2,9 @@
import java.security.KeyStore;
+/**
+ * Provides way to load KeyStore
+ */
public interface IKeyStoreLoader {
/**
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java?rev=674759&r1=674758&r2=674759&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java
Tue Jul 8 03:26:05 2008
@@ -34,7 +34,7 @@
import java.security.cert.CertificateException;
/**
- *
+ * Provides the base for loading KeyStores
*/
public abstract class AbstractKeyStoreLoader implements IKeyStoreLoader {
protected static Log log;
@@ -43,6 +43,15 @@
log = LogFactory.getLog(this.getClass());
}
+ /**
+ * Constructs a KeyStore based on keystore location , keystore password ,
keystore type and
+ * provider
+ * @param location The location of the KeyStore
+ * @param storePassword Password to unlock KeyStore
+ * @param storeType KeyStore type
+ * @param provider Provider
+ * @return KeyStore Instance
+ */
protected KeyStore getKeyStore(String location, String storePassword,
String storeType, String provider) {
File keyStoreFile = new File(location);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/FileBaseSecretRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/FileBaseSecretRepository.java?rev=674759&r1=674758&r2=674759&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/FileBaseSecretRepository.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/FileBaseSecretRepository.java
Tue Jul 8 03:26:05 2008
@@ -59,7 +59,7 @@
private IdentityKeyStoreWrapper identity;
/* Wrapper for trusted KeyStore */
private TrustKeyStoreWrapper trust;
- /* Whether this secrte repository has been initiated successfully*/
+ /* Whether this secret repository has been initiated successfully*/
private boolean initialize = false;
public FileBaseSecretRepository(IdentityKeyStoreWrapper wrapper,
TrustKeyStoreWrapper trust) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java?rev=674759&r1=674758&r2=674759&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
Tue Jul 8 03:26:05 2008
@@ -266,7 +266,7 @@
Option alias = new Option(ALIAS, true, "Alias name for identify key
owner");
Option trusted = new Option(TRUSTED, false, "Is this KeyStore trusted
one");
- Option keyFile = new Option(KEY_FILE, true, "private key from a file");
+ Option keyFile = new Option(KEY_FILE, true, "Private key from a file");
Option cipherType = new Option(CIPHER_TYPE, true, "Cipher type");
Option opMode = new Option(OP_MODE, true, "encrypt or decrypt");
@@ -274,8 +274,8 @@
Option source = new Option(SOURCE_IN_LINED, true, "Plain text
in-lined");
Option sourceFile = new Option(SOURCE_FILE, true, "Plain text from a
file");
Option targetFile = new Option(TARGET_FILE, true, "Target file");
- Option outType = new Option(OUT_TYPE, true, "encode type for output");
- Option intType = new Option(IN_TYPE, true, "encode type of input
source");
+ Option outType = new Option(OUT_TYPE, true, "Encode type for output");
+ Option intType = new Option(IN_TYPE, true, "Encode type of input
source");
options.addOption(keyStore);
options.addOption(storeType);
@@ -325,9 +325,9 @@
}
} catch (IOException e) {
- handleException("Error reading ", e);
+ handleException("Error reading key from given path : " + filePath,
e);
} catch (ClassNotFoundException e) {
- handleException("Cannot load a key from the file" + filePath, e);
+ handleException("Cannot load a key from the file : " + filePath,
e);
} finally {
if (in != null) {
try {
