Index: src/main/java/org/wso2/esb/ServiceBus.java
===================================================================
--- src/main/java/org/wso2/esb/ServiceBus.java	(revision 20007)
+++ src/main/java/org/wso2/esb/ServiceBus.java	(working copy)
@@ -34,13 +34,21 @@
 
 public class ServiceBus {
 
-    private static Log log = LogFactory.getLog(ServiceBus.class);
+    public static final String ESB_CONFIG_DIR = System.getProperty("esb.config.dir", "");
+    
+    private static Log log = LogFactory.getLog(ServiceBus.class);   
     private static final String JAVA_IO_TMP = "java.io.tmpdir";
+    private static final String TOMCAT_LOG4J_PROPERTY_FILE = "tomcat-log4j.properties";
 
     public static void main(String[] args) {
+        String tomcatConfDir = null;
+        if (ESB_CONFIG_DIR.length() > 0) {
+            tomcatConfDir = ESB_CONFIG_DIR;
+        } else {
+            tomcatConfDir = "tomcat" + File.separator + "conf";
+        }
 
-        PropertyConfigurator.configure("tomcat" + File.separator + "conf" +
-            File.separator + "tomcat-log4j.properties");
+        PropertyConfigurator.configure(tomcatConfDir + File.separator + TOMCAT_LOG4J_PROPERTY_FILE);
 
         log.info("[ESB] Starting the WSO2 ESB ...");
 
Index: src/main/java/org/wso2/esb/TomcatServer.java
===================================================================
--- src/main/java/org/wso2/esb/TomcatServer.java	(revision 20007)
+++ src/main/java/org/wso2/esb/TomcatServer.java	(working copy)
@@ -115,7 +115,12 @@
 
     private void addSSLConnector() {
 
-        String ksLocation = getTomcatProperty("KeyStore.Location", "webapp/WEB-INF/classes/conf/identity.jks");
+        String defaultKsLocation = ServiceBus.ESB_CONFIG_DIR;
+        if (defaultKsLocation.length() == 0) {
+            defaultKsLocation = "webapp/WEB-INF/classes/conf/identity.jks";
+        }
+
+        String ksLocation = getTomcatProperty("KeyStore.Location", defaultKsLocation);
         String ksPassword = getTomcatProperty("KeyStore.Password", "password");
 
         String absKsLocation;