Author: nzamosenchuk Date: 2011-04-28 04:47:14 -0400 (Thu, 28 Apr 2011) New Revision: 4320 Modified: ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java Log: EXOJCR-1323 : applying the patch Modified: ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java =================================================================== --- ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-04-28 08:31:16 UTC (rev 4319) +++ ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-04-28 08:47:14 UTC (rev 4320) @@ -80,13 +80,25 @@ LOG.error("Error of configurationURL read", e); } + // If no configuration in web.xml check system property. + if (configurationURL == null) + configurationURL = System.getProperty(CONF_URL_PARAMETER); + try { StandaloneContainer.addConfigurationURL(configurationURL); } catch (MalformedURLException e) { - LOG.error("Error of addConfigurationURL", e); + // Try to use path, we do not need have full path (file:/path/conf) to configuration. Any relative path is OK. + try + { + StandaloneContainer.addConfigurationPath(configurationURL); + } + catch (MalformedURLException e2) + { + LOG.error("Error of addConfiguration", e2); + } } try