[wsas-java-dev] svn commit r4646 - in trunk/wsas/java/modules: core/lib core/src/org/wso2/wsas/util distribution

[svn at wso2.org]

Author: azeez
Date: Mon Jul  2 07:25:35 2007
New Revision: 4646

Modified:
   trunk/wsas/java/modules/core/lib/README
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java
   trunk/wsas/java/modules/distribution/pom.xml
Log:
1. Storing the absolute path for keystores
2. Copying the clustering libs



Modified: trunk/wsas/java/modules/core/lib/README
==============================================================================
--- trunk/wsas/java/modules/core/lib/README	(original)
+++ trunk/wsas/java/modules/core/lib/README	Mon Jul  2 07:25:35 2007
@@ -6,3 +6,5 @@
 
 The only difference between the axis2.xml in this directory and that
 the core/conf directory is that the transport receivers are different.
+This axis2.xml file will be used by WSO2 WSAS, when deployed in a
+J2EE servlet container.

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java	Mon Jul  2 07:25:35 2007
@@ -25,6 +25,7 @@
 import org.wso2.wsas.persistence.PersistenceManager;
 import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
 import org.wso2.wsas.persistence.exception.KeyStoreAlreadyExistsException;
+import org.wso2.wsas.ServerConstants;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -63,6 +64,10 @@
             KeyStoreDO keyStoreDO = new KeyStoreDO();
             keyStoreDO.setKeyStoreName(ksName);
             keyStoreDO.setIsPrimaryKeyStore(isPrimaryKeyStore);
+            if (!new File(keyStoreLocation).isAbsolute()) {
+                keyStoreLocation = System.getProperty(ServerConstants.WSO2WSAS_HOME) +
+                                   File.separator + keyStoreLocation;
+            }
             keyStoreDO.setFilePath(keyStoreLocation);
             keyStoreDO.setKeyStoreType(keyStoreType);
             keyStoreDO.setProvider(provider);
@@ -129,7 +134,12 @@
     public static KeyStore getKeyStore(String keyStoreName) throws Exception {
         KeyStoreDO keyStoreDO = pm.getKeyStore(keyStoreName);
         KeyStore keyStore = KeyStore.getInstance(keyStoreDO.getKeyStoreType());
-        FileInputStream ksIn = new FileInputStream(keyStoreDO.getFilePath());
+        String filePath = keyStoreDO.getFilePath();
+        if (!new File(filePath).isAbsolute()) {
+            filePath = System.getProperty(ServerConstants.WSO2WSAS_HOME) +
+                       File.separator + filePath;
+        }
+        FileInputStream ksIn = new FileInputStream(filePath);
         BufferedInputStream ksbufin = new BufferedInputStream(ksIn);
         String storePassword = keyStoreDO.getStorePassword();
         ServerConfiguration config = ServerConfiguration.getInstance();
@@ -140,8 +150,7 @@
                                config.getFirstProperty("Security.KeyStore.KeyPassword"),
                                config.getFirstProperty("Security.KeyStore.Type"));
         keyStore.load(ksbufin,
-                      new String(cryptoUtil.base64DecodeAndDecrypt(storePassword)).
-                              toCharArray()); //Populate the keystore
+                      new String(cryptoUtil.base64DecodeAndDecrypt(storePassword)).toCharArray());
 
         return keyStore;
     }

Modified: trunk/wsas/java/modules/distribution/pom.xml
==============================================================================
--- trunk/wsas/java/modules/distribution/pom.xml	(original)
+++ trunk/wsas/java/modules/distribution/pom.xml	Mon Jul  2 07:25:35 2007
@@ -580,6 +580,12 @@
             <version>${pom.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.wso2.wsas</groupId>
+            <artifactId>wso2wsas-clustering</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
         <!-- Bouncycastle dependencies -->
         <dependency>
             <groupId>bouncycastle</groupId>