Author: pnedonosko Date: 2010-02-23 08:50:44 -0500 (Tue, 23 Feb 2010) New Revision: 1944 Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java Log: EXOJCR-541 exo-conf used in StandaloneContainer Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2010-02-23 10:42:51 UTC (rev 1943) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2010-02-23 13:50:44 UTC (rev 1944) @@ -313,11 +313,18 @@ // or if (configurationURL == null) { - + J2EEServerInfo env = new J2EEServerInfo(); + // (2) exo-configuration.xml in AS (standalone) home directory - configurationURL = new URL("file:" + (new J2EEServerInfo()).getServerHome() + "/exo-configuration.xml"); + configurationURL = new URL("file:" + env.getServerHome() + "/exo-configuration.xml"); - // (3) conf/exo-configuration.xml in war/ear(?) + // (3) AS_HOME/conf/exo-conf (JBossAS usecase) + if (!fileExists(configurationURL)) + { + configurationURL = new URL("file:" + env.getExoConfigurationDirectory() + "/exo-configuration.xml"); + } + + // (4) conf/exo-configuration.xml in war/ear(?) if (!fileExists(configurationURL) && configClassLoader != null) { configurationURL = configClassLoader.getResource("conf/exo-configuration.xml");