Author: paristote Date: 2011-05-24 00:12:51 -0400 (Tue, 24 May 2011) New Revision: 4414 Added: ws/branches/2.1.x/patch/2.1.9-GA/WS-265/readme.txt Modified: ws/branches/2.1.x/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java Log: WS-265 What is the problem to fix? * Problem of WS-264 Patch StandaloneContainerInitializedListener to get it works with relative path configured as system property exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java * Problem of WS-265 To be able to stop all the services, it is need to call container.stop on contextDestroyed of StandaloneContainerInitializedListener. How is the problem fixed? * Stop the StandaloneContainer on context destroyed Allow to set configuration from relative path Modified: ws/branches/2.1.x/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java =================================================================== --- ws/branches/2.1.x/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-05-24 02:09:14 UTC (rev 4413) +++ ws/branches/2.1.x/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-05-24 04:12:51 UTC (rev 4414) @@ -19,7 +19,6 @@ package org.exoplatform.ws.frameworks.servlet; import org.exoplatform.container.StandaloneContainer; -import org.exoplatform.container.configuration.ConfigurationManagerImpl; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.naming.InitialContextInitializer; @@ -80,13 +79,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 @@ -116,6 +127,6 @@ */ public void contextDestroyed(ServletContextEvent event) { - // container.stop(); + container.stop(); } } Added: ws/branches/2.1.x/patch/2.1.9-GA/WS-265/readme.txt =================================================================== --- ws/branches/2.1.x/patch/2.1.9-GA/WS-265/readme.txt (rev 0) +++ ws/branches/2.1.x/patch/2.1.9-GA/WS-265/readme.txt 2011-05-24 04:12:51 UTC (rev 4414) @@ -0,0 +1,71 @@ +Summary + + Status: Stop the StandaloneContainer on context destroyed + CCP Issue: N/A, Product Jira Issue: WS-265 fixed also WS-264 + Complexity: Low + +The Proposal +Problem description + +What is the problem to fix? +Problem of WS-264 +Patch StandaloneContainerInitializedListener to get it works with relative path configured as system property + +exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java + +Problem of WS-265 +To be able to stop all the services, it is need to call container.stop on contextDestroyed of StandaloneContainerInitializedListener. +Fix description + +How is the problem fixed? + +* Stop the StandaloneContainer on context destroyed + + Allow to set configuration from relative path + +Patch information: +WS-265.patch + +Tests to perform + +Reproduction test + * No + +Tests performed at DevLevel + * Functional testing in ws project + +Tests performed at QA/Support Level +* + +Documentation changes + +Documentation changes: + * No + +Configuration changes + +Configuration changes: + * No + +Will previous configuration continue to work? + * Yes + +Risks and impacts + +Can this bug fix have any side effects on current client projects? + No + +Is there a performance risk/cost? + * No + +Validation (PM/Support/QA) + +PM Comment +* PL review: Patch validated + +Support Comment +* Support review: Patch validated + +QA Feedbacks +* +