[exo-jcr-commits] exo-jcr SVN: r4257 - ws/tags/2.1.8-GA-BONITA/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet.
Author: pnedonosko
Date: 2011-04-19 11:42:02 -0400 (Tue, 19 Apr 2011)
New Revision: 4257
Modified:
ws/tags/2.1.8-GA-BONITA/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
Log:
WS-264 commit of patch
https://jira.exoplatform.org/secure/attachment/33914/2011-04-14.patch
Modified:
ws/tags/2.1.8-GA-BONITA/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
===================================================================
---
ws/tags/2.1.8-GA-BONITA/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-04-19
15:38:43 UTC (rev 4256)
+++
ws/tags/2.1.8-GA-BONITA/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-04-19
15:42:02 UTC (rev 4257)
@@ -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