Author: indika
Date: Mon Jul 7 04:45:18 2008
New Revision: 674464
URL: http://svn.apache.org/viewvc?rev=674464&view=rev
Log:
add more logs
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/IdentityKeyStoreInformation.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/KeyStoreInformation.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/TrustKeyStoreInformation.java
synapse/trunk/java/repository/conf/synapse.properties
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/IdentityKeyStoreInformation.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/IdentityKeyStoreInformation.java?rev=674464&r1=674463&r2=674464&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/IdentityKeyStoreInformation.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/IdentityKeyStoreInformation.java
Mon Jul 7 04:45:18 2008
@@ -22,18 +22,29 @@
import java.security.KeyStore;
/**
- *
+ * Represents the abstraction private key entry store (identity) information
*/
public class IdentityKeyStoreInformation extends KeyStoreInformation {
+ /* Password for access private key*/
private String keyPassword;
public void setKeyPassword(String keyPassword) {
this.keyPassword = keyPassword;
}
+ /**
+ * Returns the IdentityKeyManagerFactory instance
+ *
+ * @return IdentityKeyManagerFactory instance
+ */
public KeyManagerFactory getIdentityKeyManagerFactoryInstance() {
+
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Creating a IdentityKeyManagerFactory instance");
+ }
+
KeyStore keyStore = this.getIdentityKeyStore();
KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance(
KeyManagerFactory.getDefaultAlgorithm());
@@ -47,6 +58,11 @@
return null;
}
+ /**
+ * Returns a KeyStore instance that has been created from identity keystore
+ *
+ * @return KeyStore Instance
+ */
public KeyStore getIdentityKeyStore() {
return super.getKeyStore();
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/KeyStoreInformation.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/KeyStoreInformation.java?rev=674464&r1=674463&r2=674464&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/KeyStoreInformation.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/KeyStoreInformation.java
Mon Jul 7 04:45:18 2008
@@ -38,7 +38,7 @@
*/
public abstract class KeyStoreInformation {
- private static final Log log =
LogFactory.getLog(KeyStoreInformation.class);
+ protected final Log log;
public static final String KEYSTORE_CERTIFICATE_FILE_PATH =
"keyStoreCertificateFilePath";
public static final String ENABLE_HOST_NAME_VERIFIER =
"enableHostnameVerifier";
@@ -50,6 +50,10 @@
private final Map parameters = new HashMap();
+ protected KeyStoreInformation() {
+ log = LogFactory.getLog(this.getClass());
+ }
+
public void setStoreType(String storeType) {
if (storeType == null || "".equals(storeType)) {
if (log.isDebugEnabled()) {
@@ -84,14 +88,12 @@
this.location = location;
}
- protected void handleException(String msg) {
- log.error(msg);
- throw new SynapseException(msg);
+ public void setProvider(String provider) {
+ this.provider = provider;
}
- protected void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseException(msg, e);
+ public void setKeyStorePassword(String keyStorePassword) {
+ this.keyStorePassword = keyStorePassword;
}
public void addParameter(String name, String value) {
@@ -102,6 +104,11 @@
return (String) parameters.get(name);
}
+ /**
+ * Constructs the KeyStore according to the store type
+ *
+ * @return KeyStore Instance
+ */
protected KeyStore getKeyStore() {
switch (storeType) {
case JKS:
@@ -126,12 +133,14 @@
}
}
- public void setProvider(String provider) {
- this.provider = provider;
+ protected void handleException(String msg) {
+ log.error(msg);
+ throw new SynapseException(msg);
}
- public void setKeyStorePassword(String keyStorePassword) {
- this.keyStorePassword = keyStorePassword;
+ protected void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new SynapseException(msg, e);
}
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/TrustKeyStoreInformation.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/TrustKeyStoreInformation.java?rev=674464&r1=674463&r2=674464&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/TrustKeyStoreInformation.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/TrustKeyStoreInformation.java
Mon Jul 7 04:45:18 2008
@@ -22,12 +22,21 @@
import java.security.KeyStore;
/**
- *
+ * Represents the abstraction - Trusted Certificate Store Information
*/
public class TrustKeyStoreInformation extends KeyStoreInformation {
+ /**
+ * Returns the TrustManagerFactory instance
+ *
+ * @return TrustManagerFactory instance
+ */
public TrustManagerFactory getTrustManagerFactoryInstance() {
+
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Creating a TrustManagerFactory instance");
+ }
KeyStore trustStore = this.getKeyStore();
TrustManagerFactory trustManagerfactory =
TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm());
@@ -41,6 +50,11 @@
return null;
}
+ /**
+ * Returns a KeyStore instance that has been created using trust store
+ *
+ * @return KeyStore Instance
+ */
public KeyStore getTrustStore() {
return super.getKeyStore();
Modified: synapse/trunk/java/repository/conf/synapse.properties
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/synapse.properties?rev=674464&r1=674463&r2=674464&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/synapse.properties (original)
+++ synapse/trunk/java/repository/conf/synapse.properties Mon Jul 7 04:45:18
2008
@@ -31,7 +31,7 @@
#keystore.identity.alias=synapse
#keystore.identity.storePassword=password
#keystore.identity.keyPassword=password
-#keystore.identity.parameters=enableHostnameVerifier=true;keyStoreCertificateFilePath=/home/esb.cer
+#keystore.identity.parameters=enableHostnameVerifier=false;keyStoreCertificateFilePath=/home/esb.cer
#
#keystore.trust.location=lib/trust.jks
#keystore.trust.type=JKS
