Author: keith Date: Tue Jul 15 09:06:51 2008 New Revision: 19339 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19339
Log: Fixing Mashup-946. We accept PKCS12 keystores too inport the private key Modified: trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java trunk/mashup/java/modules/www/cert_manager.jsp Modified: trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java?rev=19339&r1=19338&r2=19339&view=diff ============================================================================== --- trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java (original) +++ trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java Tue Jul 15 09:06:51 2008 @@ -879,7 +879,7 @@ public Boolean importPrivateKeyFromKeyStore(String userName, String keyStorePass, String privateKeyAlias, String privateKeyPass, - DataHandler dataHandler) + String storeType, DataHandler dataHandler) throws AxisFault { String msg; FileInputStream ksIn = null; @@ -889,7 +889,7 @@ try { - KeyStore userKeyStore = KeyStore.getInstance("JKS"); + KeyStore userKeyStore = KeyStore.getInstance(storeType); InputStream inputStream = dataHandler.getDataSource().getInputStream(); userKeyStore.load(inputStream, keyStorePass.toCharArray()); if (!userKeyStore.isKeyEntry(privateKeyAlias)) { Modified: trunk/mashup/java/modules/www/cert_manager.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/cert_manager.jsp?rev=19339&r1=19338&r2=19339&view=diff ============================================================================== --- trunk/mashup/java/modules/www/cert_manager.jsp (original) +++ trunk/mashup/java/modules/www/cert_manager.jsp Tue Jul 15 09:06:51 2008 @@ -271,6 +271,12 @@ onkeydown="noEnter(event);"/> <br/> <br/> + <label>KeyStore Type</label><select id="storeType" name="storeType" style="margin-left: 32px;" onkeydown="noEnter(event)"> + <option value="jks">JKS</option> + <option value="pkcs12">PKCS12</option> + </select> + <br/> + <br/> <input type="button" value="Upload" align="right" onclick="return submitImportPrivateKeyFromKeyStoreFormAsync('importPrivateKeyFromKeyStoreForm');"/> </form> _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
