Author: nzamosenchuk Date: 2011-04-28 04:53:18 -0400 (Thu, 28 Apr 2011) New Revision: 4321 Added: ws/branches/2.1.x/patch/ ws/branches/2.1.x/patch/2.1.9-GA/ ws/branches/2.1.x/patch/2.1.9-GA/WS-264/ ws/branches/2.1.x/patch/2.1.9-GA/WS-264/WS-264.patch Log: WS-264 : commiting the actual patch for 2.1.9-GA Added: ws/branches/2.1.x/patch/2.1.9-GA/WS-264/WS-264.patch =================================================================== --- ws/branches/2.1.x/patch/2.1.9-GA/WS-264/WS-264.patch (rev 0) +++ ws/branches/2.1.x/patch/2.1.9-GA/WS-264/WS-264.patch 2011-04-28 08:53:18 UTC (rev 4321) @@ -0,0 +1,31 @@ +Index: exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java +=================================================================== +--- exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java (revision 4236) ++++ exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java (working copy) +@@ -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