Author: indika
Date: Mon Jul 7 23:12:41 2008
New Revision: 674728
URL: http://svn.apache.org/viewvc?rev=674728&view=rev
Log:
minor chnages - logs, variable names
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.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
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=674728&r1=674727&r2=674728&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
Mon Jul 7 23:12:41 2008
@@ -309,7 +309,7 @@
URLConnection connection = getURLConnection(url);
if (connection == null) {
if (log.isDebugEnabled()) {
- log.debug("Cannot create a URLConnection for give URL : "
+ uri);
+ log.debug("Cannot create a URLConnection for given URL : "
+ uri);
}
return null;
}
@@ -336,6 +336,12 @@
throw new SynapseException(msg, e);
}
+ /**
+ * Helper method to create a HttpSURLCOnnection with provided KeyStores
+ *
+ * @param url Https URL
+ * @return
+ */
private static HttpsURLConnection getHttpsURLConnection(URL url) {
if (log.isDebugEnabled()) {
@@ -357,6 +363,11 @@
keyManagers = keyManagerFactory.getKeyManagers();
}
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("There is no private key entry store configuration."
+
+ " Will use JDK's default one");
+ }
}
TrustKeyStoreInformation trustInformation =
@@ -368,6 +379,11 @@
if (trustManagerFactory != null) {
trustManagers = trustManagerFactory.getTrustManagers();
}
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("There is no trusted certificate store
configuration." +
+ " Will use JDK's default one");
+ }
}
try {
@@ -432,9 +448,22 @@
return null;
}
+ /**
+ * Returns a URLCOnnection for given URL. If the URL is https one , then
URLConnectin is a
+ * HttpsURLCOnnection and it is configured with KeyStores given in the
synapse.properties file
+ *
+ * @param url URL
+ * @return URLConnection for given URL
+ */
public static URLConnection getURLConnection(URL url) {
try {
+ if (url == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Provided URL is null");
+ }
+ return null;
+ }
URLConnection connection;
if (url.getProtocol().equalsIgnoreCase("https")) {
connection = getHttpsURLConnection(url);
@@ -510,7 +539,7 @@
handleException("Invalid URL reference " +
url.getPath() + e);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug("Faild to resolve an absolute path
of the " +
+ log.debug("Failed to resolve an absolute path
of the " +
" URL using the synapse.home : " +
synapseHome);
}
log.warn("IO Error reading from URL : " +
url.getPath() + e);
@@ -533,7 +562,8 @@
}
if (log.isDebugEnabled()) {
- log.debug("Resolving import URI ' " + parentLocation + " '
against base URI ' " + relativeLocation + " ' ");
+ log.debug("Resolving import URI ' " + parentLocation + " ' " +
+ "against base URI ' " + relativeLocation + " ' ");
}
URI importUri = null;
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=674728&r1=674727&r2=674728&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 23:12:41 2008
@@ -110,6 +110,7 @@
* @return KeyStore Instance
*/
protected KeyStore getKeyStore() {
+
switch (storeType) {
case JKS:
IKeyStoreLoader jksKeyStoreLoader = new
JKSKeyStoreLoader(location,
@@ -129,6 +130,9 @@
ICACertsLoader caCertsLoader = new CACertsLoader();
return caCertsLoader.loadTrustStore(location);
default:
+ if (log.isDebugEnabled()) {
+ log.debug("No KeyStore Found");
+ }
return null;
}
}
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=674728&r1=674727&r2=674728&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 23:12:41 2008
@@ -37,12 +37,12 @@
if (log.isDebugEnabled()) {
log.debug("Creating a TrustManagerFactory instance");
}
- KeyStore trustStore = this.getKeyStore();
- TrustManagerFactory trustManagerfactory =
TrustManagerFactory.getInstance(
+ KeyStore trustStore = this.getTrustStore();
+ TrustManagerFactory trustManagerFactory =
TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm());
- trustManagerfactory.init(trustStore);
+ trustManagerFactory.init(trustStore);
- return trustManagerfactory;
+ return trustManagerFactory;
} catch (Exception e) {
handleException("Error getting TrustManagerFactory: ", e);
}
