You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/04/12 19:14:31 UTC
svn commit: r528045 - in /ofbiz/trunk/framework:
base/src/base/org/ofbiz/base/util/KeyStoreUtil.java
webapp/src/org/ofbiz/webapp/control/RequestHandler.java
Author: jaz
Date: Thu Apr 12 10:14:30 2007
New Revision: 528045
URL: http://svn.apache.org/viewvc?view=rev&rev=528045
Log:
changed name of method to a more proper name; not just truststores, but any keystore
Modified:
ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/KeyStoreUtil.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/KeyStoreUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/KeyStoreUtil.java?view=diff&rev=528045&r1=528044&r2=528045
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/KeyStoreUtil.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/KeyStoreUtil.java Thu Apr 12 10:14:30 2007
@@ -80,6 +80,19 @@
return UtilProperties.getPropertyValue("jsse.properties", "ofbiz.trustStore.type", "jks");
}
+ public static KeyStore getStore(URL url, String password) throws IOException, GeneralSecurityException {
+ return getStore(url, password, "jks");
+ }
+
+ public static KeyStore getStore(URL url, String password, String type) throws IOException, GeneralSecurityException {
+ if (type == null) {
+ throw new IOException("Invalid keystore type; null");
+ }
+ KeyStore ks = KeyStore.getInstance(type);
+ ks.load(url.openStream(), password.toCharArray());
+ return ks;
+ }
+
public static KeyStore getKeyStore() throws IOException, GeneralSecurityException {
if (getKeyStoreFileName() != null && !keyStoreExists(getKeyStoreFileName())) {
return null;
@@ -103,12 +116,6 @@
KeyStore ks = KeyStore.getInstance(getTrustStoreType());
ks.load(fis, getTrustStorePassword().toCharArray());
fis.close();
- return ks;
- }
-
- public static KeyStore getTrustStore(URL url, String password) throws IOException, GeneralSecurityException {
- KeyStore ks = KeyStore.getInstance(getTrustStoreType());
- ks.load(url.openStream(), password.toCharArray());
return ks;
}
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?view=diff&rev=528045&r1=528044&r2=528045
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Thu Apr 12 10:14:30 2007
@@ -156,7 +156,7 @@
// load the trust store
KeyStore keyStore;
try {
- keyStore = KeyStoreUtil.getTrustStore(keyStoreUrl, keyStorePass);
+ keyStore = KeyStoreUtil.getStore(keyStoreUrl, keyStorePass);
} catch (IOException e) {
throw new RequestHandlerException("Unable to open keystore", e);
} catch (GeneralSecurityException e) {