Author: nfilotto Date: 2010-05-12 06:19:45 -0400 (Wed, 12 May 2010) New Revision: 2369 Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java Log: EXOJCR-724: The current URL is now set to the URL of the imported configuration file before trying to unmarshall it. Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2010-05-12 10:17:56 UTC (rev 2368) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2010-05-12 10:19:45 UTC (rev 2369) @@ -176,10 +176,12 @@ URL urlObject = getURL(uri); if (urlObject != null) { + if (LOG_DEBUG) + log.info("\timport " + urlObject); + // Set the URL of imported file + currentURL.set(urlObject); conf = unmarshaller.unmarshall(urlObject); configurations_.mergeConfiguration(conf); - if (LOG_DEBUG) - log.info("\timport " + urlObject); } else {