[wsas-java-dev] svn commit r3986 - trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service

[svn at wso2.org]

Author: azeez
Date: Mon Jun 18 05:16:22 2007
New Revision: 3986

Modified:
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
Log:
Checking absolute path

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java	Mon Jun 18 05:16:22 2007
@@ -34,11 +34,21 @@
 import org.wso2.wsas.persistence.exception.KeyStoreAlreadyExistsException;
 import org.wso2.wsas.util.KeyStoreUtil;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.security.KeyStore;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateFactory;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Handles all cryptographic administration functions
@@ -106,7 +116,7 @@
         }
         return (String[]) certificates.toArray(new String[certificates.size()]);
     }
-    
+
     public String addNewKeyStore(String ksFilePathId,
                                  String ksPassword,
                                  String pvtKeyAlias,
@@ -207,9 +217,13 @@
             String storePassword = keyStoreDO.getStorePassword();
 
             ServerConfiguration config = ServerConfiguration.getInstance();
+            String ksFile = config.getFirstProperty("Security.KeyStore.Location");
+            if (!new File(ksFile).isAbsolute()) {
+                ksFile = System.getProperty(ServerConstants.WSO2WSAS_HOME) +
+                         File.separator + ksFile;
+            }
             CryptoUtil cryptoUtil =
-                    new CryptoUtil(System.getProperty(ServerConstants.WSO2WSAS_HOME) + File.separator +
-                                   config.getFirstProperty("Security.KeyStore.Location"),
+                    new CryptoUtil(ksFile,
                                    config.getFirstProperty("Security.KeyStore.Password"),
                                    config.getFirstProperty("Security.KeyStore.KeyAlias"),
                                    config.getFirstProperty("Security.KeyStore.KeyPassword"),