[wsas-java-dev] svn commit r1174 - in trunk/wsas/java/modules/standalone-edition: conf src/org/wso2/wsas

[svn at wso2.org]

Author: azeez
Date: Wed Mar  7 19:28:10 2007
New Revision: 1174

Modified:
   trunk/wsas/java/modules/standalone-edition/conf/axis2.xml
   trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java
Log:
Handling relative key store locations



Modified: trunk/wsas/java/modules/standalone-edition/conf/axis2.xml
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/conf/axis2.xml	(original)
+++ trunk/wsas/java/modules/standalone-edition/conf/axis2.xml	Wed Mar  7 19:28:10 2007
@@ -122,7 +122,7 @@
         <parameter name="keystore" locked="false">
             <wso2wsas:KeyStore xmlns:wso2wsas="http://www.wso2.org/products/wsas">
                 <!-- Key store file location-->
-                <wso2wsas:Location>../conf/wso2wsas.jks</wso2wsas:Location>
+                <wso2wsas:Location>conf/wso2wsas.jks</wso2wsas:Location>
                 <!-- Key store type (JKS/PKCS12 etc.)-->
                 <wso2wsas:Type>JKS</wso2wsas:Type>
                 <!-- Key store password-->

Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java	(original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java	Wed Mar  7 19:28:10 2007
@@ -31,7 +31,7 @@
 import org.wso2.wsas.util.KeyStoreUtil;
 
 import javax.xml.namespace.QName;
-import java.net.BindException;
+import java.io.File;
 import java.net.InetAddress;
 import java.net.SocketException;
 
@@ -95,6 +95,13 @@
         OMElement ksEle =
                 tInDescription.getParameter("keystore").getParameterElement().getFirstElement();
         String ksLocation = ksEle.getFirstChildWithName(new QName("Location")).getText();
+        String absKsLocation = "";
+        if (!new File(ksLocation).isAbsolute()) {
+            absKsLocation =
+                    System.getProperty(ServerConstants.WSO2WSAS_HOME) + File.separator + ksLocation;
+        } else {
+            absKsLocation = ksLocation;
+        }
         String ksType = ksEle.getFirstChildWithName(new QName("Type")).getText();
         String ksPassword = ksEle.getFirstChildWithName(new QName("Password")).getText();
 
@@ -103,14 +110,14 @@
                 tInDescription.getParameter("maxHttpHeaderSize").getValue().toString();
         String maxThreads =
                 tInDescription.getParameter("maxThreads").getValue().toString();
-        String minSpareThreads = tInDescription.
-                getParameter("minSpareThreads").getValue().toString();
-        String maxSpareThreads = tInDescription.
-                getParameter("maxSpareThreads").getValue().toString();
+        String minSpareThreads =
+                tInDescription.getParameter("minSpareThreads").getValue().toString();
+        String maxSpareThreads =
+                tInDescription.getParameter("maxSpareThreads").getValue().toString();
         String clientAuth = tInDescription.
                 getParameter("clientAuth").getValue().toString();
-        String disableUploadTimeout = tInDescription.
-                getParameter("disableUploadTimeout").getValue().toString();
+        String disableUploadTimeout =
+                tInDescription.getParameter("disableUploadTimeout").getValue().toString();
         String acceptCount = tInDescription.getParameter("clientAuth").getValue().toString();
 
         Embedded embedded = TomcatServerCache.getEmbedded();
@@ -121,7 +128,7 @@
         sslConnector.setScheme("https");
         IntrospectionUtils.setProperty(sslConnector, "sslProtocol", "TLS");
         IntrospectionUtils.setProperty(sslConnector, "keypass", ksPassword);
-        IntrospectionUtils.setProperty(sslConnector, "keystore", ksLocation);
+        IntrospectionUtils.setProperty(sslConnector, "keystore", absKsLocation);
         IntrospectionUtils.setProperty(sslConnector, "sslProtocol", sslProtocol);
         IntrospectionUtils.setProperty(sslConnector, "maxHttpHeaderSize", maxHttpHeaderSize);
         IntrospectionUtils.setProperty(sslConnector, "maxThreads", maxThreads);